Update to Bitcoin Wallet 10.20

.github/workflows/gradle7.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: ['11', '17']
+        java: ['17', '18']
         distribution: ['temurin']
         gradle: ['7.5.1']
       fail-fast: false
@@ -17,30 +17,30 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: ${{ matrix.distribution }}
           java-version: ${{ matrix.java }}
 
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v2.0.10
+        uses: android-actions/setup-android@v3
 
-      - name: Install build-tools 33.0.2, platformtools and platform android-33
-        run: sdkmanager --install "build-tools;33.0.2" "platform-tools" "platforms;android-33"
+      - name: Install build-tools 35.0.0, platformtools and platform android-33
+        run: sdkmanager --install "build-tools;35.0.0" "platform-tools" "platforms;android-35"
 
       - name: Build with Gradle
         run: |
            ./gradlew wrapper --gradle-version=${{ matrix.gradle }}
            ./gradlew clean build --stacktrace
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: groestlcoin-wallet-JAVA${{ matrix.java }}-${{ matrix.os }}-${{ matrix.gradle }}
           path: |
             wallet/build/outputs/apk/
 
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: groestlcoin-wallet-JAVA${{ matrix.java }}-${{ matrix.os }}-${{ matrix.gradle }}

README.md

@@ -12,7 +12,7 @@ This project contains several sub-projects:
 
 ### PREREQUISITES FOR BUILDING
 
-You'll need git, a Java 11 SDK and Gradle between 4.4 and 6.9.x for this. We'll assume Ubuntu 22.04 LTS (Jammy Jellyfish)
+You'll need git, a Java 11 SDK and Gradle between 4.4 and 6.9.x for this. We'll assume Ubuntu 24.04 LTS (Noble Numbat)
 for the package installs, which comes with OpenJDK 11 and Gradle 4.4.1 out of the box.
 
     # first time only

wallet/AndroidManifest.xml

@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="de.schildbach.wallet"
     android:installLocation="internalOnly"
-    android:versionCode="101500"
-    android:versionName="10.15">
+    android:versionCode="102000"
+    android:versionName="10.20">
 
     <!-- normal permissions -->
     <uses-permission android:name="android.permission.INTERNET" />
@@ -82,8 +82,7 @@
         android:icon="@drawable/ic_app_color"
         android:label="@string/app_name"
         android:localeConfig="@xml/locale_config"
-        android:networkSecurityConfig="@xml/network_security_config"
-        tools:targetApi="24">
+        android:networkSecurityConfig="@xml/network_security_config">
         <activity
             android:name="de.schildbach.wallet.ui.WalletActivity"
             android:configChanges="keyboard|keyboardHidden"
@@ -114,7 +113,7 @@
             android:configChanges="keyboard|keyboardHidden"
             android:exported="true"
             android:label="@string/send_coins_activity_title"
-            android:theme="@style/My.Theme.ChildActivity"
+            android:theme="@style/My.Theme"
             android:windowSoftInputMode="adjustResize">
             <intent-filter android:label="@string/send_coins_activity_title">
                 <action android:name="android.intent.action.VIEW" />
@@ -150,31 +149,32 @@
             android:name="de.schildbach.wallet.ui.RequestCoinsActivity"
             android:configChanges="keyboard|keyboardHidden"
             android:label="@string/request_coins_activity_title"
-            android:theme="@style/My.Theme.ChildActivity"
-            android:windowSoftInputMode="adjustResize" />
+            android:theme="@style/My.Theme"
+            android:windowSoftInputMode="adjustResize"
+            android:showWhenLocked="true" />
 
         <activity
             android:name="de.schildbach.wallet.ui.AddressBookActivity"
             android:configChanges="keyboard|keyboardHidden"
             android:label="@string/address_book_activity_title"
-            android:theme="@style/My.Theme.ChildActivity" />
+            android:theme="@style/My.Theme" />
 
         <activity
             android:name="de.schildbach.wallet.ui.ExchangeRatesActivity"
             android:configChanges="keyboard|keyboardHidden"
             android:label="@string/exchange_rates_activity_title"
-            android:theme="@style/My.Theme.ChildActivity" />
+            android:theme="@style/My.Theme" />
 
         <activity
             android:name="de.schildbach.wallet.ui.monitor.NetworkMonitorActivity"
             android:configChanges="keyboard|keyboardHidden"
             android:label="@string/network_monitor_activity_title"
-            android:theme="@style/My.Theme.ChildActivity" />
+            android:theme="@style/My.Theme" />
 
         <activity
             android:name="de.schildbach.wallet.ui.preference.PreferenceActivity"
             android:label="@string/preferences_activity_title"
-            android:theme="@style/My.Theme.ChildActivity" />
+            android:theme="@android:style/Theme.Material.Light.DarkActionBar" />
 
         <activity
             android:name="de.schildbach.wallet.ui.backup.BackupWalletActivity"
@@ -198,13 +198,14 @@
             android:configChanges="keyboard|keyboardHidden"
             android:stateNotNeeded="true"
             android:theme="@style/My.Theme.Fullscreen"
-            android:windowSoftInputMode="stateAlwaysHidden" />
+            android:windowSoftInputMode="stateAlwaysHidden"
+            android:showWhenLocked="true" />
 
         <activity
             android:name="de.schildbach.wallet.ui.send.SweepWalletActivity"
             android:configChanges="keyboard|keyboardHidden"
             android:label="@string/sweep_wallet_activity_title"
-            android:theme="@style/My.Theme.ChildActivity"
+            android:theme="@style/My.Theme"
             android:windowSoftInputMode="adjustResize" />
 
         <provider

wallet/CHANGES

@@ -1,3 +1,6 @@
+v10.20
+* Updated to Bitcoin Wallet 10.20
+
 v10.15
 * Updated to Bitcoin Wallet 10.15
 

wallet/README.recover.md

@@ -24,7 +24,7 @@ refrain from sending your coins to a temporary wallet created in that environmen
 lost e.g. on a power outage or computer failure. Your desired destination wallet should already be
 set up and you should have one of its receiving addresses or a QR code at hand.
 
-Alternatively, you can also use Ubuntu on Windows 10 64-bit, if you've fully upgraded to the Fall Creators Update (version 1709 or later). Open the Windows Start Menu, search for and start `Turn Windows features on or off`. Scroll down and tick the `Windows Subsystem for Linux` feature. Restart your computer when prompted. Next, install `Ubuntu` from the Windows Store. Once the download has completed, select `Launch`. It will prompt you to pick a username and complete the installation. From now on, you can start into a Linux shell by selecting `Ubuntu` from the Windows Start Menu.
+Alternatively, you can also use Ubuntu on Windows 10/11 64-bit (fully upgraded). Open the Windows Start Menu, search for and start `Turn Windows features on or off`. Scroll down and tick the `Windows Subsystem for Linux` feature. Restart your computer when prompted. Next, install `Ubuntu` from the Windows Store. Once the download has completed, select `Launch`. It will prompt you to pick a username and complete the installation. From now on, you can start into a Linux shell by selecting `Ubuntu` from the Windows Start Menu.
 
 You should be at least a bit familiar with the Linux shell. Commands `in fixed-width font like this`
 are meant to be executed as a shell command. Before you execute each command by pressing return,
@@ -37,7 +37,7 @@ requiring your Ubuntu user password.
 
 On your PC, within your Linux shell, install the following Ubuntu packages:
 
-    sudo apt install openjdk-8-jdk android-tools-adb openssl git gradle
+    sudo apt install openjdk-11-jdk android-tools-adb openssl git gradle
 
 On your Android device, go to Settings > Developer options and enable "USB debugging". On most
 recent devices you need to go to Settings > About first and tap on "Build number" multiple times
@@ -81,12 +81,12 @@ password.
 
 We need wallet-tool from groestlcoinj. First, in a working directory, let's get groestlcoinj:
 
-    git clone -b release-0.15 https://github.com/groestlcoin/groestlcoinj.git
+    git clone -b release-0.16 https://github.com/groestlcoin/groestlcoinj.git
+    cd groestlcoinj
 
 Make sure everything is compiled and ready to go by using once:
 
-    cd goestlcoinj/tools
-    ./wallet-tool
+    gradle clean groestlcoinj-tools:installDist
 
 Now use wallet-tool to sync the wallet from your backup:
 
@@ -96,12 +96,12 @@ Now use wallet-tool to sync the wallet from your backup:
 The sync process will take anywhere from a few minutes to hours. Wallet-tool will return to the
 shell prompt if its finished syncing. Have a look at the wallet:
 
-    ./wallet-tool dump --wallet=/tmp/goestlcoin-wallet-decrypted-backup
+    tools/build/install/wallet-tool/bin/wallet-tool dump --wallet=/tmp/groestlcoin-wallet-decrypted-backup
 
 Does the balance look right? You can see all transactions that ever touched your wallet. Now empty
 your entire wallet to the desired destination wallet if that's what you want:
 
-    ./wallet-tool send --wallet=/tmp/goestlcoin-wallet-decrypted-backup --output=<receiving address of destination wallet>:ALL
+    tools/build/install/wallet-tool/bin/wallet-tool send --wallet=/tmp/goestlcoin-wallet-decrypted-backup --output=<receiving address of destination wallet>:ALL
 
 If your wallet was protected by a spending PIN, you need to supply that PIN using the `--password=<PIN>` option.
 
@@ -112,7 +112,7 @@ are confirmed, you're done and you can skip the next paragraph to EPILOGUE.
 
 You can also get a list of your private keys, e.g. to claim coins other than Groestlcoin which may sit on the same keys. To dump the private keys use:
 
-    ./wallet-tool dump --wallet=/tmp/goestlcoin-wallet-decrypted-backup --dump-privkeys
+    tools/build/install/wallet-tool/bin/wallet-tool dump --wallet=/tmp/goestlcoin-wallet-decrypted-backup --dump-privkeys
 
 Again, if your wallet was protected by a spending PIN, you need to supply that PIN using the `--password=<PIN>` option.
 

wallet/build.gradle

@@ -13,9 +13,9 @@ configurations {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.8.0'
+    implementation 'androidx.annotation:annotation:1.8.2'
     implementation 'androidx.core:core:1.13.1'
-    implementation 'androidx.activity:activity:1.9.0'
+    implementation 'androidx.activity:activity:1.9.3'
     implementation 'androidx.fragment:fragment:1.7.1'
     implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation 'androidx.cardview:cardview:1.0.0'
@@ -28,7 +28,7 @@ dependencies {
     annotationProcessor "androidx.room:room-compiler:2.6.1"
     implementation 'com.github.groestlcoin:groestlcoinj-core:0.16.3'
     implementation 'com.google.guava:guava:33.1.0-android'
-    implementation 'com.google.zxing:core:3.5.2'
+    implementation 'com.google.zxing:core:3.5.3'
     //noinspection GradleDependency
     implementation 'com.squareup.okhttp3:okhttp:3.14.9'
     //noinspection GradleDependency
@@ -45,7 +45,7 @@ ext {
 
 android {
     compileSdkVersion 'android-34'
-    buildToolsVersion '34.0.0'
+    buildToolsVersion '35.0.0'
 
     defaultConfig {
         applicationId 'hashengineering.groestlcoin'

wallet/res-prod/xml/shortcuts.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shortcuts
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:targetApi="25">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <shortcut
         android:icon="@drawable/shortcut_scan_qr"

wallet/res/drawable-anydpi/ic_back_white_24dp.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M20,11L7.8,11l5.6,-5.6L12,4l-8,8l8,8l1.4,-1.4L7.8,13L20,13L20,11z" />
+</vector>

wallet/res/drawable/divider_dark.xml

@@ -6,5 +6,5 @@
         android:height="1dp"
         android:width="1dp" />
     <solid
-        android:color="#4fff" />
+        android:color="#2fff" />
 </shape>

wallet/res/drawable/shortcut_request_coins.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:targetApi="25">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:bottom="@dimen/shortcut_padding"

wallet/res/drawable/shortcut_scan_qr.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:targetApi="25">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:bottom="@dimen/shortcut_padding"

wallet/res/drawable/shortcut_send_coins.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:targetApi="25">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:bottom="@dimen/shortcut_padding"

wallet/res/layout-land/request_coins_fragment.xml

@@ -16,19 +16,17 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:background="@color/bg_level0"
-        android:paddingBottom="@dimen/list_entry_padding_vertical"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal"
-        android:paddingRight="@dimen/list_entry_padding_horizontal"
-        android:paddingTop="@dimen/list_entry_padding_vertical"
+        android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
+        android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
         android:orientation="vertical">
 
         <androidx.cardview.widget.CardView
             android:id="@+id/request_coins_qr_card"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginBottom="@dimen/list_entry_padding_vertical"
-            android:layout_marginTop="@dimen/list_entry_padding_vertical"
+            android:layout_marginBottom="@dimen/list_entry_padding_vertical_lax"
+            android:layout_marginTop="@dimen/list_entry_padding_vertical_lax"
             android:elevation="2dp"
             android:foreground="?android:attr/selectableItemBackground">
 

wallet/res/layout/address_book_content.xml

@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/address_book_group"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/bg_level0"
     android:orientation="vertical">
 
+    <Toolbar
+        android:id="@+id/address_book_appbar"
+        style="@style/My.Widget.Toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?android:attr/actionBarSize" />
+
     <de.schildbach.wallet.util.ViewPagerTabs
         android:id="@+id/address_book_pager_tabs"
         android:layout_width="match_parent"