rottenwheel/mysu
1
0
Fork 0
mirror of https://codeberg.org/r4v3r23/mysu.git synced 2024-11-26 15:52:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Display pub key in CoinsInfo adapter

Browse source
This commit is contained in:
pokkst 2022-09-22 17:40:54 -05:00
parent 95d5b78542
commit f52acd1169
No known key found for this signature in database
GPG key ID: 90C2ED85E67A50FF
4 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/cpp/monerujo.cpp
View file

@ -1083,17 +1083,20 @@ Java_net_mynero_wallet_model_Wallet_getCoinsJ(JNIEnv *env, jobject instance) {
jobject newCoinsInfo(JNIEnv *env, Monero::CoinsInfo *info) { jobject newCoinsInfo(JNIEnv *env, Monero::CoinsInfo *info) {
jmethodID c = env->GetMethodID(class_CoinsInfo, "<init>", jmethodID c = env->GetMethodID(class_CoinsInfo, "<init>",
"(JZLjava/lang/String;JLjava/lang/String;)V"); "(JZLjava/lang/String;JLjava/lang/String;Ljava/lang/String;)V");
jstring _key_image = env->NewStringUTF(info->keyImage().c_str()); jstring _key_image = env->NewStringUTF(info->keyImage().c_str());
jstring _pub_key = env->NewStringUTF(info->pubKey().c_str());
jstring _hash = env->NewStringUTF(info->hash().c_str()); jstring _hash = env->NewStringUTF(info->hash().c_str());
jobject result = env->NewObject(class_CoinsInfo, c, jobject result = env->NewObject(class_CoinsInfo, c,
static_cast<jlong> (info->globalOutputIndex()), static_cast<jlong> (info->globalOutputIndex()),
info->spent(), info->spent(),
_key_image, _key_image,
static_cast<jlong> (info->amount()), static_cast<jlong> (info->amount()),
_hash); _hash,
_pub_key);
env->DeleteLocalRef(_key_image); env->DeleteLocalRef(_key_image);
env->DeleteLocalRef(_hash); env->DeleteLocalRef(_hash);
env->DeleteLocalRef(_pub_key);
return result; return result;
} }

4
app/src/main/java/net/mynero/wallet/adapter/CoinsInfoAdapter.java
View file

@ -97,10 +97,10 @@ public class CoinsInfoAdapter extends RecyclerView.Adapter<CoinsInfoAdapter.View
public void bind(CoinsInfo coinsInfo, List<String> selectedUtxos) { public void bind(CoinsInfo coinsInfo, List<String> selectedUtxos) {
boolean selected = selectedUtxos.contains(coinsInfo.getKeyImage()); boolean selected = selectedUtxos.contains(coinsInfo.getKeyImage());
TextView keyImageTextView = itemView.findViewById(R.id.utxo_key_image_textview); TextView pubKeyTextView = itemView.findViewById(R.id.utxo_pub_key_textview);
TextView amountTextView = itemView.findViewById(R.id.utxo_amount_textview); TextView amountTextView = itemView.findViewById(R.id.utxo_amount_textview);
amountTextView.setText(Wallet.getDisplayAmount(coinsInfo.getAmount())); amountTextView.setText(Wallet.getDisplayAmount(coinsInfo.getAmount()));
keyImageTextView.setText(coinsInfo.getKeyImage()); pubKeyTextView.setText(coinsInfo.getPubKey());
itemView.setOnLongClickListener(view -> { itemView.setOnLongClickListener(view -> {
listener.onUtxoSelected(coinsInfo); listener.onUtxoSelected(coinsInfo);
return true; return true;

8
app/src/main/java/net/mynero/wallet/model/CoinsInfo.java
View file

@ -34,13 +34,15 @@ public class CoinsInfo implements Parcelable {
String keyImage; String keyImage;
long amount; long amount;
String hash; String hash;
String pubKey;
public CoinsInfo(long globalOutputIndex, boolean spent, String keyImage, long amount, String hash) { public CoinsInfo(long globalOutputIndex, boolean spent, String keyImage, long amount, String hash, String pubKey) {
this.globalOutputIndex = globalOutputIndex; this.globalOutputIndex = globalOutputIndex;
this.spent = spent; this.spent = spent;
this.keyImage = keyImage; this.keyImage = keyImage;
this.amount = amount; this.amount = amount;
this.hash = hash; this.hash = hash;
this.pubKey = pubKey;
} }
protected CoinsInfo(Parcel in) { protected CoinsInfo(Parcel in) {
@ -79,6 +81,10 @@ public class CoinsInfo implements Parcelable {
return amount; return amount;
} }
public String getPubKey() {
return pubKey;
}
@Override @Override
public int describeContents() { public int describeContents() {
return 0; return 0;

4
app/src/main/res/layout/utxo_selection_item.xml
View file

@ -7,7 +7,7 @@
android:padding="8dp" android:padding="8dp"
android:layout_marginBottom="8dp"> android:layout_marginBottom="8dp">
<TextView <TextView
android:id="@+id/utxo_key_image_textview" android:id="@+id/utxo_pub_key_textview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Key Image" android:text="Key Image"
@ -23,7 +23,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Amount" android:text="Amount"
android:ellipsize="middle" android:ellipsize="middle"
app:layout_constraintTop_toBottomOf="@id/utxo_key_image_textview" app:layout_constraintTop_toBottomOf="@id/utxo_pub_key_textview"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"