Merge pull request #1310 from dashpay/bugfix-read-images-permission (…

…v10.3.1) v10.3.1: remove read images permission and fix upgrade crash
dashpay · Sep 30, 2024 · b6af80a · b6af80a
2 parents 2ab6b93 + 1c0f3fb
commit b6af80a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/wallet/AndroidManifest.xml b/wallet/AndroidManifest.xml
@@ -22,7 +22,6 @@
     <!-- dangerous permissions -->
     <uses-permission android:name="android.permission.CAMERA" /> <!-- group: CAMERA -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
@@ -415,10 +414,11 @@
             android:name="de.schildbach.wallet.service.BlockchainServiceImpl"
             android:exported="false"
             android:foregroundServiceType="dataSync" />
-        <service
+
+        <!--service
             android:name="de.schildbach.wallet.offline.AcceptBluetoothService"
             android:exported="false"
-            android:foregroundServiceType="connectedDevice" />
+            android:foregroundServiceType="connectedDevice" /-->
 
         <receiver
             android:name="de.schildbach.wallet.service.BootstrapReceiver"

diff --git a/wallet/CHANGES b/wallet/CHANGES
@@ -1,4 +1,7 @@
 Dash Wallet
+v10.3.1
+* Hot fix: prevent crash in some upgrade scenarios
+
 v10.3.0
 * Add CoinJoin Support
 * Merge and hide DashPay functionality

diff --git a/wallet/build.gradle b/wallet/build.gradle
@@ -205,8 +205,8 @@ android {
         compileSdk 34
         minSdkVersion 24
         targetSdkVersion 34
-        versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 103009
-        versionName project.hasProperty('versionName') ? project.property('versionName') : "10.3.0"
+        versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 103010
+        versionName project.hasProperty('versionName') ? project.property('versionName') : "10.3.1"
         multiDexEnabled true
         generatedDensities = ['hdpi', 'xhdpi']
         vectorDrawables.useSupportLibrary = true

diff --git a/wallet/src/de/schildbach/wallet/WalletApplication.java b/wallet/src/de/schildbach/wallet/WalletApplication.java
@@ -449,7 +449,9 @@ public void finalizeInitialization() {
             createNotificationChannels();
         }
 
-        initPlatform();
+        if (Constants.SUPPORTS_PLATFORM) {
+            initPlatform();
+        }
         initUphold();
         initCoinbase();
         initDashDirect();