Upgrade to monero v0.11.0.0 (#50)

app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java

@@ -100,6 +100,7 @@ public class GenerateReviewFragment extends Fragment {
         String address;
         String seed;
         String viewKey;
+        String spendKey;
         boolean isWatchOnly;
         Wallet.Status status;
 
@@ -129,6 +130,7 @@ public class GenerateReviewFragment extends Fragment {
             address = wallet.getAddress();
             seed = wallet.getSeed();
             viewKey = wallet.getSecretViewKey();
+            spendKey = isWatchOnly ? getActivity().getString(R.string.watchonly_label) : wallet.getSecretSpendKey();
             isWatchOnly = wallet.isWatchOnly();
             if (closeWallet) wallet.close();
             return true;
@@ -147,12 +149,7 @@ public class GenerateReviewFragment extends Fragment {
                 tvWalletAddress.setText(address);
                 tvWalletMnemonic.setText(seed);
                 tvWalletViewKey.setText(viewKey);
-                String spend = isWatchOnly ? "" : "not available - use seed for recovery";
-                if (spend.length() > 0) { //TODO should be == 64, but spendkey is not in the API yet
-                    tvWalletSpendKey.setText(spend);
-                } else {
-                    tvWalletSpendKey.setText(getString(R.string.generate_wallet_watchonly));
-                }
+                tvWalletSpendKey.setText(spendKey);
             } else {
                 // TODO show proper error message
                 // TODO end the fragment

app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java

@@ -511,7 +511,6 @@ public class LoginActivity extends AppCompatActivity
         }
     }
 
-
     private class MyProgressDialog extends ProgressDialog {
         Activity activity;
 

app/src/main/java/com/m2049r/xmrwallet/SendFragment.java

@@ -67,9 +67,10 @@ public class SendFragment extends Fragment {
     Button bReallySend;
     ProgressBar pbProgress;
 
-    final static int Mixins[] = {4, 6, 8, 10, 13}; // must match the layout XML
+    final static int Mixins[] = {4, 7, 12, 25}; // must match the layout XML
     final static PendingTransaction.Priority Priorities[] =
-            {PendingTransaction.Priority.Priority_Low,
+            {PendingTransaction.Priority.Priority_Default,
+                    PendingTransaction.Priority.Priority_Low,
                     PendingTransaction.Priority.Priority_Medium,
                     PendingTransaction.Priority.Priority_High}; // must match the layout XML
 
@@ -443,6 +444,7 @@ public class SendFragment extends Fragment {
             }
         });
         builder.setMessage(errorText);
+        builder.setCancelable(false);
         builder.create().show();
     }
 

app/src/main/java/com/m2049r/xmrwallet/model/PendingTransaction.java

@@ -34,6 +34,7 @@ public class PendingTransaction {
     }
 
     public enum Priority {
+        Priority_Default(0),
         Priority_Low(1),
         Priority_Medium(2),
         Priority_High(3),
@@ -41,6 +42,8 @@ public class PendingTransaction {
 
         public static Priority fromInteger(int n) {
             switch (n) {
+                case 0:
+                    return Priority_Default;
                 case 1:
                     return Priority_Low;
                 case 2:

app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java

@@ -81,6 +81,8 @@ public class Wallet {
 
     public native String getSecretViewKey();
 
+    public native String getSecretSpendKey();
+
     public boolean store() {
         return store("");
     }