Merge pull request #1304 from dashpay/merge-dashpay-into-dash-wallet

Merge Dash Wallet into DashPay * disable DashPay features for prod and testnet
dashpay · Sep 9, 2024 · a47cc17 · a47cc17
2 parents 71d1092 + 394bae3
commit a47cc17
Show file tree

Hide file tree

Showing 86 changed files with 941 additions and 3,032 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -7,9 +7,9 @@ apply plugin: 'dagger.hilt.android.plugin'
 android {
 
     defaultConfig {
-        compileSdk 33
+        compileSdk 34
         minSdkVersion 24
-        targetSdkVersion 33
+        targetSdkVersion 34
         vectorDrawables.useSupportLibrary = true
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/common/src/main/java/org/dash/wallet/common/InteractionAwareActivity.java b/common/src/main/java/org/dash/wallet/common/InteractionAwareActivity.java
@@ -20,6 +20,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.os.Build;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
@@ -33,7 +34,12 @@ public class InteractionAwareActivity extends SecureActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         IntentFilter filter = new IntentFilter(FORCE_FINISH_ACTION);
-        registerReceiver(forceFinishReceiver, filter);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            registerReceiver(forceFinishReceiver, filter, Context.RECEIVER_NOT_EXPORTED);
+        } else {
+            registerReceiver(forceFinishReceiver, filter);
+        }
     }
 
     @Override

diff --git a/common/src/main/java/org/dash/wallet/common/ui/orbitview/OrbitView.kt b/common/src/main/java/org/dash/wallet/common/ui/orbitview/OrbitView.kt
@@ -76,7 +76,7 @@ class OrbitView @JvmOverloads constructor(
         view.y = centerY + sin(angle.toFloat() * Math.PI.toFloat() / 180f) * r
     }
 
-    override fun onDraw(canvas: Canvas?) {
+    override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
 
         color?.let {

diff --git a/common/src/main/java/org/dash/wallet/common/ui/orbitview/PlanetView.kt b/common/src/main/java/org/dash/wallet/common/ui/orbitview/PlanetView.kt
@@ -84,7 +84,7 @@ class PlanetView @JvmOverloads constructor(
         }
     }
 
-    override fun onDraw(canvas: Canvas?) {
+    override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
 
         planetDrawable?.setBounds(0, 0, measuredWidth, measuredHeight)

diff --git a/features/exploredash/build.gradle b/features/exploredash/build.gradle
@@ -10,9 +10,9 @@ plugins {
 
 android {
     defaultConfig {
-        compileSdk 33
+        compileSdk 34
         minSdkVersion 24
-        targetSdkVersion 33
+        targetSdkVersion 34
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
         javaCompileOptions {
@@ -91,8 +91,8 @@ dependencies {
     implementation "com.google.zxing:core:$zxingVersion"
 
     // Maps & Location
-    implementation 'com.google.android.gms:play-services-location:18.0.0'
-    implementation 'com.google.android.gms:play-services-maps:18.0.0'
+    implementation 'com.google.android.gms:play-services-location:21.3.0'
+    implementation 'com.google.android.gms:play-services-maps:18.2.0'
     implementation 'com.google.maps.android:maps-ktx:3.2.0'
     implementation 'com.google.maps.android:android-maps-utils:2.2.6'
 
@@ -115,7 +115,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion"
     testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoVersion"
     testImplementation "androidx.arch.core:core-testing:$coreTestingVersion"
-    testImplementation "org.robolectric:robolectric:4.9.2"
+    testImplementation "org.robolectric:robolectric:4.13"
     testImplementation "androidx.room:room-testing:$roomVersion"
 
     androidTestImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoVersion"

diff --git a/...loredash/src/main/java/org/dash/wallet/features/exploredash/services/UserLocationState.kt b/...loredash/src/main/java/org/dash/wallet/features/exploredash/services/UserLocationState.kt
@@ -99,7 +99,7 @@ constructor(private val context: Context, private val client: FusedLocationProvi
                 override fun onLocationResult(locationResult: LocationResult) {
                     super.onLocationResult(locationResult)
                     val location = locationResult.lastLocation
-                    val newLocation = Pair(location.latitude, location.longitude)
+                    val newLocation = Pair(location!!.latitude, location.longitude)
                     val distance =
                         distanceBetween(
                             previousLocation.first,

diff --git a/...res/exploredash/src/test/java/org/dash/wallet/features/exploredash/ExploreDatabaseTest.kt b/...res/exploredash/src/test/java/org/dash/wallet/features/exploredash/ExploreDatabaseTest.kt
@@ -77,13 +77,13 @@ class ExploreDatabaseTest {
         }
     }
 
-    @Test
+    @Test @Ignore // sometimes this fails due to missing empty_explore.db error
     fun emptyPreloadedDb_throwDoesNotUpdateLocalTimestamp() = runTest {
         val dbBuilder =
             Room.databaseBuilder(appContext, ExploreDatabase::class.java, "explore.db").allowMainThreadQueries()
 
         val resource = javaClass.classLoader?.getResource("empty_explore.db")
-        val updateFile = File(resource?.file ?: throw Resources.NotFoundException("explore.db not found"))
+        val updateFile = File(resource?.file ?: throw Resources.NotFoundException("empty_explore.db not found"))
 
         var database: ExploreDatabase? = null
 
@@ -98,7 +98,7 @@ class ExploreDatabaseTest {
         }
     }
 
-    @Test
+    @Test @Ignore // sometimes this fails due to missing explore.db error
     fun badPreloadedDb_throwsAndDoesNotUpdateLocalTimestamp() = runTest {
         val dbBuilder =
             Room.databaseBuilder(appContext, ExploreDatabase::class.java, "explore.db").allowMainThreadQueries()

diff --git a/integrations/coinbase/build.gradle b/integrations/coinbase/build.gradle
@@ -10,9 +10,9 @@ plugins {
 android {
 
     defaultConfig {
-        compileSdk 33
+        compileSdk 34
         minSdkVersion 24
-        targetSdkVersion 33
+        targetSdkVersion 34
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/integrations/crowdnode/build.gradle b/integrations/crowdnode/build.gradle
@@ -10,9 +10,9 @@ plugins {
 
 android {
     defaultConfig {
-        compileSdk 33
+        compileSdk 34
         minSdkVersion 24
-        targetSdkVersion 33
+        targetSdkVersion 34
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }

diff --git a/integrations/uphold/build.gradle b/integrations/uphold/build.gradle
@@ -9,9 +9,9 @@ plugins {
 android {
 
     defaultConfig {
-        compileSdk 33
+        compileSdk 34
         minSdkVersion 24
-        targetSdkVersion 33
+        targetSdkVersion 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/sample-integration-android/build.gradle b/sample-integration-android/build.gradle
@@ -38,9 +38,9 @@ android {
     }
 
     defaultConfig {
-        compileSdk 33
+        compileSdk 34
         minSdkVersion 24
-        targetSdkVersion 33
+        targetSdkVersion 34
         multiDexEnabled true
     }
     compileOptions {

diff --git a/wallet/AndroidManifest.xml b/wallet/AndroidManifest.xml
@@ -8,12 +8,14 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 
     <!-- dangerous permissions -->
@@ -23,6 +25,7 @@
     <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" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
     <uses-feature
         android:name="android.hardware.touchscreen"
@@ -107,6 +110,7 @@
             android:label="@string/app_name_short"
             android:screenOrientation="portrait"
             android:theme="@style/LockScreenActivity.Child.Theme"
+            android:launchMode="singleTop"
             android:windowSoftInputMode="adjustResize" />
 
         <activity-alias
@@ -408,10 +412,12 @@
 
         <service
             android:name="de.schildbach.wallet.service.BlockchainServiceImpl"
-            android:exported="false" />
+            android:exported="false"
+            android:foregroundServiceType="dataSync" />
         <service
             android:name="de.schildbach.wallet.offline.AcceptBluetoothService"
-            android:exported="false" />
+            android:exported="false"
+            android:foregroundServiceType="connectedDevice" />
 
         <receiver
             android:name="de.schildbach.wallet.service.BootstrapReceiver"
@@ -430,7 +436,8 @@
             android:permission="android.permission.BIND_JOB_SERVICE" />
         <service
             android:name="de.schildbach.wallet.ui.dashpay.CreateIdentityService"
-            android:exported="false" />
+            android:exported="false"
+            android:foregroundServiceType="dataSync"/>
 
         <service
             android:name="de.schildbach.wallet.ui.notifications.PushMessagingService"

diff --git a/wallet/CHANGES b/wallet/CHANGES
@@ -1,4 +1,14 @@
 Dash Wallet
+v10.2.0
+* Support Core 21
+* Fix syncing stuck at 30% or 31% bug
+
+v10.1.1
+* Attempt to fix stuck at Syncing 30 or 31%
+* Support devices without a camera flash
+* Warn user of stale (old) exchange rates
+* Add Jetpack Compose component
+
 v10.1.0
 * Add ZenLedger support
 * Coinbase: upgrade payment methods to v3

diff --git a/wallet/androidTest/de/schildbach/wallet/database/DatabaseMigrationTest.kt b/wallet/androidTest/de/schildbach/wallet/database/DatabaseMigrationTest.kt
@@ -60,9 +60,7 @@ open class DatabaseMigrationTest {
 
     private val migrations = arrayOf(
         AppDatabaseMigrations.migration11To12,
-        AppDatabaseMigrations.migration12To17,
-        AppDatabaseMigrations.migration17To18,
-        AppDatabaseMigrations.migration18To19
+        AppDatabaseMigrations.migration12To13
     )
 
     @Rule
@@ -91,7 +89,7 @@ open class DatabaseMigrationTest {
             InstrumentationRegistry.getInstrumentation().targetContext,
             AppDatabase::class.java, TEST_DB_NAME
         ).addMigrations(*migrations)
-            .fallbackToDestructiveMigrationFrom(1,2, 3, 4, 5,6, 7,8 ,9, 10)
+            .fallbackToDestructiveMigrationFrom(1, 2, 3, 4, 5, 6, 7, 8 , 9, 10)
             .build()
 
         // Check that data is valid