Bugfixes (#85)

* android.view.WindowManager

* refactor

* lock_guard listener

* new version

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 13
-        versionName "0.8"
+        versionCode 18
+        versionName "0.8.0.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

app/src/main/cpp/monerujo.cpp

@@ -39,6 +39,8 @@ static jclass class_WalletListener;
 static jclass class_TransactionInfo;
 static jclass class_Transfer;
 
+std::mutex _listenerMutex;
+
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *jvm, void *reserved) {
     cachedJVM = jvm;
     LOGI("JNI_OnLoad");
@@ -101,6 +103,7 @@ struct MyWalletListener : Bitmonero::WalletListener {
     };
 
     void deleteGlobalJavaRef(JNIEnv *env) {
+        std::lock_guard<std::mutex> lock(_listenerMutex);
         env->DeleteGlobalRef(jlistener);
         jlistener = nullptr;
     }
@@ -109,6 +112,7 @@ struct MyWalletListener : Bitmonero::WalletListener {
  * @brief updated  - generic callback, called when any event (sent/received/block reveived/etc) happened with the wallet;
  */
     void updated() {
+        std::lock_guard<std::mutex> lock(_listenerMutex);
         if (jlistener == nullptr) return;
         LOGD("updated");
         JNIEnv *jenv;
@@ -128,6 +132,7 @@ struct MyWalletListener : Bitmonero::WalletListener {
      * @param amount     - amount
      */
     void moneySpent(const std::string &txId, uint64_t amount) {
+        std::lock_guard<std::mutex> lock(_listenerMutex);
         if (jlistener == nullptr) return;
         LOGD("moneySpent %"
                      PRIu64, amount);
@@ -139,6 +144,7 @@ struct MyWalletListener : Bitmonero::WalletListener {
      * @param amount        - amount
      */
     void moneyReceived(const std::string &txId, uint64_t amount) {
+        std::lock_guard<std::mutex> lock(_listenerMutex);
         if (jlistener == nullptr) return;
         LOGD("moneyReceived %"
                      PRIu64, amount);
@@ -150,6 +156,7 @@ struct MyWalletListener : Bitmonero::WalletListener {
      * @param amount        - amount
      */
     void unconfirmedMoneyReceived(const std::string &txId, uint64_t amount) {
+        std::lock_guard<std::mutex> lock(_listenerMutex);
         if (jlistener == nullptr) return;
         LOGD("unconfirmedMoneyReceived %"
                      PRIu64, amount);
@@ -160,6 +167,7 @@ struct MyWalletListener : Bitmonero::WalletListener {
      * @param height        - block height
      */
     void newBlock(uint64_t height) {
+        std::lock_guard<std::mutex> lock(_listenerMutex);
         if (jlistener == nullptr) return;
         //LOGD("newBlock");
         JNIEnv *jenv;
@@ -178,6 +186,7 @@ struct MyWalletListener : Bitmonero::WalletListener {
  * @brief refreshed - called when wallet refreshed by background thread or explicitly refreshed by calling "refresh" synchronously
  */
     void refreshed() {
+        std::lock_guard<std::mutex> lock(_listenerMutex);
         if (jlistener == nullptr) return;
         LOGD("refreshed");
         JNIEnv *jenv;
@@ -465,14 +474,15 @@ JNIEXPORT jboolean JNICALL
 Java_com_m2049r_xmrwallet_model_WalletManager_closeJ(JNIEnv *env, jobject instance,
                                                      jobject walletInstance) {
     Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, walletInstance);
-    bool closeSuccess = Bitmonero::WalletManagerFactory::getWalletManager()->closeWallet(wallet, false);
+    bool closeSuccess = Bitmonero::WalletManagerFactory::getWalletManager()->closeWallet(wallet,
+                                                                                         false);
     if (closeSuccess) {
         MyWalletListener *walletListener = getHandle<MyWalletListener>(env, walletInstance,
                                                                        "listenerHandle");
         if (walletListener != nullptr) {
             walletListener->deleteGlobalJavaRef(env);
+            delete walletListener;
         }
-        delete walletListener;
     }
     LOGD("wallet closed");
     return closeSuccess;
@@ -531,8 +541,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_setPassword(JNIEnv *env, jobject instance
 JNIEXPORT jstring JNICALL
 Java_com_m2049r_xmrwallet_model_Wallet_getAddressJ(JNIEnv *env, jobject instance) {
     Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
-    const char *address = wallet->address().c_str();
-    return env->NewStringUTF(address);
+    return env->NewStringUTF(wallet->address().c_str());
 }
 
 JNIEXPORT jstring JNICALL
@@ -602,7 +611,8 @@ Java_com_m2049r_xmrwallet_model_Wallet_initJ(JNIEnv *env, jobject instance,
     const char *_daemon_username = env->GetStringUTFChars(daemon_username, JNI_FALSE);
     const char *_daemon_password = env->GetStringUTFChars(daemon_password, JNI_FALSE);
     Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
-    bool status = wallet->init(_daemon_address, upper_transaction_size_limit, _daemon_username, _daemon_password);
+    bool status = wallet->init(_daemon_address, upper_transaction_size_limit, _daemon_username,
+                               _daemon_password);
     env->ReleaseStringUTFChars(daemon_address, _daemon_address);
     env->ReleaseStringUTFChars(daemon_username, _daemon_username);
     env->ReleaseStringUTFChars(daemon_password, _daemon_password);
@@ -920,7 +930,7 @@ jobject newTransferInstance(JNIEnv *env, uint64_t amount, const std::string &add
 
 jobject newTransferList(JNIEnv *env, Bitmonero::TransactionInfo *info) {
     const std::vector<Bitmonero::TransactionInfo::Transfer> &transfers = info->transfers();
-    if (transfers.size()==0) { // don't create empty Lists
+    if (transfers.size() == 0) { // don't create empty Lists
         return nullptr;
     }
     // make new ArrayList

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

@@ -40,7 +40,6 @@ import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
-import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -76,12 +75,13 @@ public class LoginActivity extends AppCompatActivity
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Log.d(TAG, "onCreate()");
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.login_activity);
         if (savedInstanceState != null) {
-            return;
+            // we don't store anything ourselves
         }
 
+        setContentView(R.layout.login_activity);
         toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
@@ -187,13 +187,10 @@ public class LoginActivity extends AppCompatActivity
     }
 
     private class AsyncRename extends AsyncTask<String, Void, Boolean> {
-        ProgressDialog progressDialog = new MyProgressDialog(LoginActivity.this, R.string.rename_progress);
-
         @Override
         protected void onPreExecute() {
             super.onPreExecute();
-            progressDialog.show();
-            LoginActivity.this.asyncWaitTask = this;
+            showProgressDialog(R.string.rename_progress);
         }
 
         @Override
@@ -207,13 +204,15 @@ public class LoginActivity extends AppCompatActivity
         @Override
         protected void onPostExecute(Boolean result) {
             super.onPostExecute(result);
-            progressDialog.dismiss();
+            if (isDestroyed()) {
+                return;
+            }
+            dismissProgressDialog();
             if (result) {
                 reloadWalletList();
             } else {
                 Toast.makeText(LoginActivity.this, getString(R.string.rename_failed), Toast.LENGTH_LONG).show();
             }
-            LoginActivity.this.asyncWaitTask = null;
         }
     }
 
@@ -283,13 +282,10 @@ public class LoginActivity extends AppCompatActivity
 
 
     private class AsyncBackup extends AsyncTask<String, Void, Boolean> {
-        ProgressDialog progressDialog = new MyProgressDialog(LoginActivity.this, R.string.backup_progress);
-
         @Override
         protected void onPreExecute() {
             super.onPreExecute();
-            progressDialog.show();
-            LoginActivity.this.asyncWaitTask = this;
+            showProgressDialog(R.string.backup_progress);
         }
 
         @Override
@@ -301,11 +297,13 @@ public class LoginActivity extends AppCompatActivity
         @Override
         protected void onPostExecute(Boolean result) {
             super.onPostExecute(result);
-            progressDialog.dismiss();
+            if (isDestroyed()) {
+                return;
+            }
+            dismissProgressDialog();
             if (!result) {
                 Toast.makeText(LoginActivity.this, getString(R.string.backup_failed), Toast.LENGTH_LONG).show();
             }
-            LoginActivity.this.asyncWaitTask = null;
         }
     }
 
@@ -335,13 +333,10 @@ public class LoginActivity extends AppCompatActivity
     }
 
     private class AsyncArchive extends AsyncTask<String, Void, Boolean> {
-        ProgressDialog progressDialog = new MyProgressDialog(LoginActivity.this, R.string.archive_progress);
-
         @Override
         protected void onPreExecute() {
             super.onPreExecute();
-            progressDialog.show();
-            LoginActivity.this.asyncWaitTask = this;
+            showProgressDialog(R.string.archive_progress);
         }
 
         @Override
@@ -358,13 +353,15 @@ public class LoginActivity extends AppCompatActivity
         @Override
         protected void onPostExecute(Boolean result) {
             super.onPostExecute(result);
-            progressDialog.dismiss();
+            if (isDestroyed()) {
+                return;
+            }
+            dismissProgressDialog();
             if (result) {
                 reloadWalletList();
             } else {
                 Toast.makeText(LoginActivity.this, getString(R.string.archive_failed), Toast.LENGTH_LONG).show();
             }
-            LoginActivity.this.asyncWaitTask = null;
         }
     }
 
@@ -530,7 +527,26 @@ public class LoginActivity extends AppCompatActivity
         super.onPause();
     }
 
-    AsyncTask asyncWaitTask = null; // TODO should this really be set from all AsyncTasks here?
+    ProgressDialog progressDialog = null;
+
+    private void showProgressDialog(int msgId) {
+        dismissProgressDialog(); // just in case
+        progressDialog = new MyProgressDialog(LoginActivity.this, msgId);
+        progressDialog.show();
+    }
+
+    private void dismissProgressDialog() {
+        if (progressDialog != null && progressDialog.isShowing()) {
+            progressDialog.dismiss();
+        }
+        progressDialog = null;
+    }
+
+    @Override
+    protected void onDestroy() {
+        dismissProgressDialog();
+        super.onDestroy();
+    }
 
     @Override
     protected void onResume() {
@@ -538,7 +554,7 @@ public class LoginActivity extends AppCompatActivity
         Log.d(TAG, "onResume()");
         setTitle(getString(R.string.login_activity_name));
         // wait for WalletService to finish
-        if (WalletService.Running && (asyncWaitTask == null)) {
+        if (WalletService.Running && (progressDialog == null)) {
             // and show a progress dialog, but only if there isn't one already
             new AsyncWaitForService().execute();
         }
@@ -562,13 +578,10 @@ public class LoginActivity extends AppCompatActivity
 
 
     private class AsyncWaitForService extends AsyncTask<Void, Void, Void> {
-        ProgressDialog progressDialog = new MyProgressDialog(LoginActivity.this, R.string.service_progress);
-
         @Override
         protected void onPreExecute() {
             super.onPreExecute();
-            progressDialog.show();
-            LoginActivity.this.asyncWaitTask = this;
+            showProgressDialog(R.string.service_progress);
         }
 
         @Override
@@ -586,12 +599,13 @@ public class LoginActivity extends AppCompatActivity
         @Override
         protected void onPostExecute(Void result) {
             super.onPostExecute(result);
-            progressDialog.dismiss();
-            LoginActivity.this.asyncWaitTask = null;
+            if (isDestroyed()) {
+                return;
+            }
+            dismissProgressDialog();
         }
     }
 
-
     void startWallet(String walletName, String walletPassword) {
         Log.d(TAG, "startWallet()");
         Intent intent = new Intent(getApplicationContext(), WalletActivity.class);
@@ -707,6 +721,7 @@ public class LoginActivity extends AppCompatActivity
         @Override
         protected void onPreExecute() {
             super.onPreExecute();
+            showProgressDialog(R.string.generate_wallet_creating);
         }
 
         @Override
@@ -747,6 +762,10 @@ public class LoginActivity extends AppCompatActivity
         @Override
         protected void onPostExecute(Boolean result) {
             super.onPostExecute(result);
+            if (isDestroyed()) {
+                return;
+            }
+            dismissProgressDialog();
             if (result) {
                 startDetails(newWalletFile, walletPassword, GenerateReviewFragment.VIEW_TYPE_ACCEPT);
             } else {
@@ -754,7 +773,6 @@ public class LoginActivity extends AppCompatActivity
                         getString(R.string.generate_wallet_create_failed), Toast.LENGTH_LONG).show();
                 walletGenerateError();
             }
-            LoginActivity.this.asyncWaitTask = null;
         }
     }
 

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

@@ -186,7 +186,7 @@ public class LoginFragment extends Fragment {
         etDaemonAddress.setOnFocusChangeListener(new View.OnFocusChangeListener() {
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
-                if (hasFocus) {
+                if (hasFocus && !getActivity().isFinishing()) {
                     etDaemonAddress.showDropDown();
                     Helper.showKeyboard(getActivity());
                 }

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

@@ -150,14 +150,16 @@ public class WalletActivity extends AppCompatActivity implements WalletFragment.
     protected void onCreate(Bundle savedInstanceState) {
         Log.d(TAG, "onCreate()");
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.wallet_activity);
         if (savedInstanceState != null) {
-            return;
+            // we don't store anything ourselves
         }
 
+        setContentView(R.layout.wallet_activity);
         toolbar = (Toolbar) findViewById(R.id.toolbar);
-        toolbar.setTitle(R.string.app_name);
         setSupportActionBar(toolbar);
+
+        toolbar.setTitle(R.string.app_name);
+
         boolean testnet = WalletManager.getInstance().isTestNet();
         if (testnet) {
             toolbar.setBackgroundResource(R.color.colorPrimaryDark);

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

@@ -50,8 +50,6 @@ public class Wallet {
         ConnectionStatus_WrongVersion
     }
 
-    //public native long createWalletListenerJ();
-
     public native String getSeed();
 
     public native String getSeedLanguage();
@@ -68,11 +66,11 @@ public class Wallet {
 
     public native boolean setPassword(String password);
 
+    private String address = null;
+
     public String getAddress() {
-        String address = getAddressJ();
-        if (!Wallet.isAddressValid(address, WalletManager.getInstance().isTestNet())) {
-            // just die!
-            throw new IllegalStateException("Wallet returned invalid address!");
+        if (address == null) {
+            address = getAddressJ();
         }
         return address;
     }

app/src/main/res/layout/gen_fragment.xml

@@ -1,107 +1,112 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:weightSum="2">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <EditText
-            android:id="@+id/etWalletName"
-            style="@style/MoneroEdit"
-            android:layout_width="0dp"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:hint="@string/generate_name_hint"
-            android:imeOptions="actionNext"
-            android:inputType="text"
-            android:maxLines="1"
-            android:textAlignment="center" />
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <EditText
+                android:id="@+id/etWalletName"
+                style="@style/MoneroEdit"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:hint="@string/generate_name_hint"
+                android:imeOptions="actionNext"
+                android:inputType="text"
+                android:maxLines="1"
+                android:textAlignment="center" />
+
+            <EditText
+                android:id="@+id/etWalletPassword"
+                style="@style/MoneroEdit"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:hint="@string/generate_password_hint"
+                android:imeOptions="actionNext"
+                android:inputType="text"
+                android:textAlignment="center" />
+        </LinearLayout>
 
         <EditText
-            android:id="@+id/etWalletPassword"
-            style="@style/MoneroEdit"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:hint="@string/generate_password_hint"
-            android:imeOptions="actionNext"
-            android:inputType="text"
-            android:textAlignment="center" />
-    </LinearLayout>
-
-    <EditText
-        android:id="@+id/etWalletMnemonic"
-        style="@style/MoneroEdit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/generate_mnemonic_hint"
-        android:imeOptions="actionNext"
-        android:inputType="textMultiLine"
-        android:textAlignment="center" />
-
-    <EditText
-        android:id="@+id/etWalletAddress"
-        style="@style/MoneroEdit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/generate_address_hint"
-        android:imeOptions="actionNext"
-        android:inputType="textMultiLine"
-        android:textAlignment="center" />
-
-    <LinearLayout
-        android:id="@+id/llRestoreKeys"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="gone">
-
-        <EditText
-            android:id="@+id/etWalletViewKey"
+            android:id="@+id/etWalletMnemonic"
             style="@style/MoneroEdit"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/generate_viewkey_hint"
+            android:hint="@string/generate_mnemonic_hint"
             android:imeOptions="actionNext"
             android:inputType="textMultiLine"
             android:textAlignment="center" />
 
         <EditText
-            android:id="@+id/etWalletSpendKey"
+            android:id="@+id/etWalletAddress"
             style="@style/MoneroEdit"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/generate_spendkey_hint"
+            android:hint="@string/generate_address_hint"
             android:imeOptions="actionNext"
             android:inputType="textMultiLine"
-            android:textAlignment="center"/>
+            android:textAlignment="center" />
+
+        <LinearLayout
+            android:id="@+id/llRestoreKeys"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+            <EditText
+                android:id="@+id/etWalletViewKey"
+                style="@style/MoneroEdit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/generate_viewkey_hint"
+                android:imeOptions="actionNext"
+                android:inputType="textMultiLine"
+                android:textAlignment="center" />
+
+            <EditText
+                android:id="@+id/etWalletSpendKey"
+                style="@style/MoneroEdit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/generate_spendkey_hint"
+                android:imeOptions="actionNext"
+                android:inputType="textMultiLine"
+                android:textAlignment="center" />
+        </LinearLayout>
+
+        <EditText
+            android:id="@+id/etWalletRestoreHeight"
+            style="@style/MoneroEdit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/generate_restoreheight_hint"
+            android:imeOptions="actionDone"
+            android:inputType="number"
+            android:textAlignment="center"
+            android:visibility="gone" />
+
+        <Button
+            android:id="@+id/bGenerate"
+            style="@style/MoneroButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_marginTop="8dp"
+            android:enabled="false"
+            android:text="@string/generate_buttonGenerate" />
+
     </LinearLayout>
-
-    <EditText
-        android:id="@+id/etWalletRestoreHeight"
-        style="@style/MoneroEdit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/generate_restoreheight_hint"
-        android:imeOptions="actionDone"
-        android:inputType="number"
-        android:textAlignment="center"
-        android:visibility="gone" />
-
-    <Button
-        android:id="@+id/bGenerate"
-        style="@style/MoneroButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginTop="8dp"
-        android:enabled="false"
-        android:text="@string/generate_buttonGenerate" />
-
-</LinearLayout>
+</ScrollView>

app/src/main/res/layout/login_activity.xml

@@ -6,7 +6,6 @@
     android:orientation="vertical">
 
     <include
-        android:id="@+id/toolbar"
         layout="@layout/toolbar" />
 
     <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

app/src/main/res/layout/wallet_activity.xml

@@ -7,7 +7,6 @@
     android:orientation="vertical">
 
     <include
-        android:id="@+id/toolbar"
         layout="@layout/toolbar" />
 
     <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

app/src/main/res/values/strings.xml

@@ -97,6 +97,7 @@
 
     <string name="generate_wallet_exists">Wallet exists! Choose another name</string>
     <string name="generate_wallet_dot">Wallet name may not begin with \'.\'</string>
+    <string name="generate_wallet_creating">Creating wallet</string>
     <string name="generate_wallet_created">Wallet created</string>
     <string name="generate_wallet_create_failed">Wallet create failed</string>
     <string name="generate_wallet_create_failed_1">Wallet create failed (1/2)</string>