bump version & fix versionCode (#694)

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 502
-        versionName "1.15.2 'Dark Fork'"
+        versionCode 503
+        versionName "1.15.3 'Dark Fork'"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
@@ -92,8 +92,7 @@ android {
         variant.outputs.all {
             output ->
                 def abiName = output.getFilter(com.android.build.OutputFile.ABI)
-                output.versionCodeOverride = abiCodes.get(abiName, 0) + 10 * variant.versionCode
-                //def flavor = output.getFilter(flavor)
+                output.versionCodeOverride = abiCodes.get(abiName, 0) + 10 * versionCode
 
                 if (abiName == null) abiName = "universal"
                 def v = "${variant.versionName}".replaceFirst(" '.*' ?", "")

app/src/main/java/com/m2049r/xmrwallet/util/Helper.java

@@ -167,7 +167,9 @@ public class Helper {
 
     static public void showKeyboard(Activity act) {
         InputMethodManager imm = (InputMethodManager) act.getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.showSoftInput(act.getCurrentFocus(), InputMethodManager.SHOW_IMPLICIT);
+        final View focus = act.getCurrentFocus();
+        if (focus != null)
+            imm.showSoftInput(focus, InputMethodManager.SHOW_IMPLICIT);
     }
 
     static public void hideKeyboard(Activity act) {

external-libs/monero/include/wallet2_api.h

@@ -506,6 +506,11 @@ struct Wallet
      */
     virtual std::string publicMultisigSignerKey() const = 0;
 
+    /*!
+     * \brief stop - interrupts wallet refresh() loop once (doesn't stop background refresh thread)
+     */
+    virtual void stop() = 0;
+
     /*!
      * \brief store - stores wallet to file.
      * \param path - main filename to store wallet to. additionally stores address file and keys file.

external-libs/script/monero-build.sh

@@ -48,6 +48,7 @@ for arch in ${archs[@]}; do
 
     TARGET_LIB_DIR=$lib_root/monero/$arch/lib
     if [ -f "$TARGET_LIB_DIR/libwallet_api.a" ]; then
+      echo "$TARGET_LIB_DIR/libwallet_api.a exists"
       continue
     fi
 

external-libs/script/monero-fetch.sh

@@ -7,7 +7,7 @@ source script/env.sh
 cd $EXTERNAL_LIBS_BUILD_ROOT
 
 url="https://github.com/m2049r/monero"
-version="release-v0.17.1.0-monerujo"
+version="release-v0.17.1.1-monerujo"
 
 if [ ! -d "monero" ]; then
   git clone ${url} -b ${version}
@@ -15,6 +15,7 @@ if [ ! -d "monero" ]; then
   git submodule update --recursive --init
 else
   cd monero
+  git fetch
   git checkout ${version}
   git pull
   git submodule update --recursive --init