Merge pull request #38 from aliascash/develop_android

Android app bugfix release
aliascash · Sep 23, 2021 · 6b129fc · 6b129fc
2 parents 9a6c527 + fc24af5
commit 6b129fc
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/build-featurebranch-android.yml b/.github/workflows/build-featurebranch-android.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - android_*
+      - android/*
 
 jobs:
   # ==========================================================================

diff --git a/.github/workflows/build-featurebranch.yml b/.github/workflows/build-featurebranch.yml
@@ -5,6 +5,7 @@ on:
       - 'master'
       - 'develop'
       - '*android*'
+      - 'android/*'
 
 jobs:
   # ==========================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ project(Alias
         )
 
 # ANDROID_VERSION_CODE must be increased with every PlayStore release!
-set(ANDROID_VERSION_CODE 17)
+set(ANDROID_VERSION_CODE 18)
 set(ANDROID_SDK_VERSION 29)
 
 message(STATUS "")

diff --git a/Docker/Android/Dockerfile b/Docker/Android/Dockerfile
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-android:1.2 as build
+FROM aliascash/alias-wallet-builder-android:1.3 as build
 MAINTAINER HLXEasy <[email protected]>
 
 # Build parameters

diff --git a/Docker/Android/Dockerfile_noUpload b/Docker/Android/Dockerfile_noUpload
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-android:1.2
+FROM aliascash/alias-wallet-builder-android:1.3
 MAINTAINER HLXEasy <[email protected]>
 
 # Build parameters

diff --git a/ReleaseNotes_Android.md b/ReleaseNotes_Android.md
@@ -21,6 +21,11 @@ SPDX-License-Identifier: MIT
 This releasenotes document covers only the Android relevant changes. For full
 releasenotes please head over to [the latest release on Github](https://github.com/aliascash/alias-wallet/releases/latest).
 
+#### 4.4.1.18 Android (released 2021-09-21)
+- Fixed UI flaw on transaction list
+- Updated to Boost to 1.77
+- Increased timeout when creating transaction from 30 to 180 seconds
+
 #### 4.4.1.17 Android (released 2021-09-05)
 - Downgrade of used Boost version to 1.73 as with 1.75 app is crashing on Android 10 and below
 - Included Tor version updated to 0.4.5.9

diff --git a/scripts/include/handle_buildconfig.sh b/scripts/include/handle_buildconfig.sh
@@ -39,10 +39,12 @@ ANDROID_API_ARMV7=26
 ANDROID_API_X86_64=26
 
 ##### ### # Boost # ### #####################################################
+#BOOST_VERSION=1.73.0
+#BOOST_ARCHIVE_HASH=9995e192e68528793755692917f9eb6422f3052a53c5e13ba278a228af6c7acf
 #BOOST_VERSION=1.75.0
 #BOOST_ARCHIVE_HASH=aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a
-BOOST_VERSION=1.73.0
-BOOST_ARCHIVE_HASH=9995e192e68528793755692917f9eb6422f3052a53c5e13ba278a228af6c7acf
+BOOST_VERSION=1.77.0
+BOOST_ARCHIVE_HASH=5347464af5b14ac54bb945dc68f1dd7c56f0dad7262816b956138fc53bcc0131
 
 ##### ### # Qt # ### ########################################################
 # Path to the folder which contains the Qt installation

diff --git a/src/qt/spectreclientbridge.cpp b/src/qt/spectreclientbridge.cpp
@@ -227,7 +227,7 @@ void SpectreClientBridge::sendCoins(bool fUseCoinControl, QString sChangeAddr)
     else
         sendResultPendingReply = window->walletModel->sendCoins(0, recipients, coins);
 
-    if (!sendResultPendingReply.waitForFinished())
+    if (!sendResultPendingReply.waitForFinished(180000))
          return abortSendCoins(tr("Core not responding."));
 
     sendResult = sendResultPendingReply.returnValue();
@@ -246,7 +246,7 @@ void SpectreClientBridge::sendCoins(bool fUseCoinControl, QString sChangeAddr)
                 sendResultPendingReply = window->walletModel->sendCoinsAnon(sendResult.fee(), recipients, coins);
             else
                 sendResultPendingReply = window->walletModel->sendCoins(sendResult.fee(), recipients, coins);
-            if (!sendResultPendingReply.waitForFinished())
+            if (!sendResultPendingReply.waitForFinished(180000))
                 return abortSendCoins(tr("Core not responding."));
             sendResult = sendResultPendingReply.returnValue();
             sendCoinsStatus = sendResult.status();