Merge pull request #439 from sora-xor/mwr-995

Mwr 995
sora-xor · Oct 23, 2024 · f872f58 · f872f58
2 parents b14d6c6 + 6e2b387
commit f872f58
Show file tree

Hide file tree

Showing 37 changed files with 67 additions and 58 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -16,11 +16,11 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 // soralution 138 3.8.5.0 2024.09.06
-// sora dae 115 3.8.5.0 2024.09.09
+// sora dae 116 3.8.5.1 2024.10.23
 
 android {
     namespace = "jp.co.soramitsu.sora"
@@ -30,8 +30,8 @@ android {
         applicationId = "jp.co.soramitsu.sora"
         minSdk = 26
         targetSdk = 34
-        versionCode = System.getenv("CI_BUILD_ID")?.toInt() ?: 115
-        versionName = "3.8.5.0"
+        versionCode = System.getenv("CI_BUILD_ID")?.toInt() ?: 116
+        versionName = "3.8.5.1"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled = true
         // resConfigs "en", "ru", "es", "fr", "de", "nb", "in", "tr", "ar"
@@ -172,7 +172,7 @@ play {
     serviceAccountCredentials = file(System.getenv("CI_PLAY_KEY") ?: "../key/fake.json")
     track = "internal"
     releaseStatus = ReleaseStatus.DRAFT
-    releaseName = "3.8.5.0 - SORA Card Improvements"
+    releaseName = "3.8.5.1 - Bug fixes and minor improvements"
     defaultToAppBundles = true
 }
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -11,9 +11,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-<!--    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />-->
 
     <queries>
         <package android:name="com.soracard.iban.wallet"/>

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -30,7 +30,7 @@ fun maybeWrapQuotes(s: String): String {
 val composeCompilerVersion: String by project
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/common/src/production/assets/sora2_metadata b/common/src/production/assets/sora2_metadata
diff --git a/common_wallet/build.gradle.kts b/common_wallet/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 val composeCompilerVersion: String by project
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/core_db/build.gradle.kts b/core_db/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/demeter/build.gradle.kts b/demeter/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 val composeCompilerVersion: String by project
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_account_api/build.gradle.kts b/feature_account_api/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_account_impl/build.gradle.kts b/feature_account_impl/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_assets_api/build.gradle.kts b/feature_assets_api/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 val composeCompilerVersion: String by project
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_assets_impl/build.gradle.kts b/feature_assets_impl/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 val composeCompilerVersion: String by project
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/...va/jp/co/soramitsu/feature_assets_impl/presentation/screens/scan/QRCodeScannerActivity.kt b/...va/jp/co/soramitsu/feature_assets_impl/presentation/screens/scan/QRCodeScannerActivity.kt
@@ -32,14 +32,14 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package jp.co.soramitsu.feature_assets_impl.presentation.screens.scan
 
-import android.app.Activity
 import android.content.Intent
 import android.graphics.Color
+import android.net.Uri
 import android.os.Bundle
 import android.view.KeyEvent
 import android.widget.Toast
-import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
@@ -68,12 +68,10 @@ class QRCodeScannerActivity : AppCompatActivity() {
 
     private var capture: CaptureManager? = null
 
-    private val startForResultFromGallery: ActivityResultLauncher<Intent> =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
-            if (result.resultCode == Activity.RESULT_OK) {
-                result.data?.data?.let { selectedImageUri ->
-                    viewModel.decodeScannedQrCodeUri(selectedImageUri)
-                }
+    private val startForResultFromGallery: ActivityResultLauncher<PickVisualMediaRequest> =
+        registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { resultUri: Uri? ->
+            resultUri?.let { selectedImageUri ->
+                viewModel.decodeScannedQrCodeUri(selectedImageUri)
             }
         }
 
@@ -176,14 +174,8 @@ class QRCodeScannerActivity : AppCompatActivity() {
     }
 
     private fun selectQrFromGallery() {
-        val intent = Intent().apply {
-            type = QR_CODE_IMAGE_TYPE
-            action = Intent.ACTION_GET_CONTENT
-        }
-        startForResultFromGallery.launch(intent)
-    }
-
-    private companion object {
-        const val QR_CODE_IMAGE_TYPE = "image/*"
+        val pickVisualMediaRequest =
+            PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly)
+        startForResultFromGallery.launch(pickVisualMediaRequest)
     }
 }
diff --git a/feature_blockexplorer_api/build.gradle.kts b/feature_blockexplorer_api/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 val composeCompilerVersion: String by project
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_blockexplorer_impl/build.gradle.kts b/feature_blockexplorer_impl/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 val composeCompilerVersion: String by project
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_ecosystem_impl/build.gradle.kts b/feature_ecosystem_impl/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 val composeCompilerVersion: String by project
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_ethereum_api/build.gradle.kts b/feature_ethereum_api/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_main_api/build.gradle.kts b/feature_main_api/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_main_impl/build.gradle.kts b/feature_main_impl/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 val composeCompilerVersion: String by project
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_multiaccount_api/build.gradle.kts b/feature_multiaccount_api/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_multiaccount_impl/build.gradle.kts b/feature_multiaccount_impl/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 val composeCompilerVersion: String by project
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_polkaswap_api/build.gradle.kts b/feature_polkaswap_api/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_polkaswap_impl/build.gradle.kts b/feature_polkaswap_impl/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 val composeCompilerVersion: String by project
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_referral_api/build.gradle.kts b/feature_referral_api/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_referral_impl/build.gradle.kts b/feature_referral_impl/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 val composeCompilerVersion: String by project
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_select_node_api/build.gradle.kts b/feature_select_node_api/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_select_node_impl/build.gradle.kts b/feature_select_node_impl/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 val composeCompilerVersion: String by project
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_sora_card_api/build.gradle.kts b/feature_sora_card_api/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_sora_card_impl/build.gradle.kts b/feature_sora_card_impl/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 val composeCompilerVersion: String by project
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_wallet_api/build.gradle.kts b/feature_wallet_api/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_wallet_impl/build.gradle.kts b/feature_wallet_impl/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 val composeCompilerVersion: String by project
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/feature_wallet_impl/src/main/AndroidManifest.xml b/feature_wallet_impl/src/main/AndroidManifest.xml
@@ -1 +1,13 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+
+    <application>
+        <service
+            android:name="androidx.work.impl.foreground.SystemForegroundService"
+            android:foregroundServiceType="dataSync"
+            tools:node="merge" />
+    </application>
+
+</manifest>
diff --git a/..._impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/claim/ClaimWorker.kt b/..._impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/claim/ClaimWorker.kt
@@ -33,6 +33,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package jp.co.soramitsu.feature_wallet_impl.presentation.claim
 
 import android.content.Context
+import android.content.pm.ServiceInfo
+import android.os.Build
 import androidx.core.app.NotificationManagerCompat
 import androidx.hilt.work.HiltWorker
 import androidx.work.CoroutineWorker
@@ -46,6 +48,7 @@ import dagger.assisted.AssistedInject
 import javax.inject.Inject
 import jp.co.soramitsu.common.R
 import jp.co.soramitsu.common.logger.FirebaseWrapper
+import jp.co.soramitsu.common.util.BuildUtils
 import jp.co.soramitsu.common.util.Notification
 import jp.co.soramitsu.feature_wallet_api.domain.interfaces.WalletInteractor
 import jp.co.soramitsu.feature_wallet_api.domain.model.MigrationStatus
@@ -82,7 +85,11 @@ class ClaimWorker @AssistedInject constructor(
             .setContentTitle(appContext.getString(R.string.claim_notification_text))
             .build()
 
-        val foregroundInfo = ForegroundInfo(NOTIFICATION_ID, notification)
+        val foregroundInfo = if (BuildUtils.sdkAtLeast(Build.VERSION_CODES.Q)) {
+            ForegroundInfo(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
+        } else {
+            ForegroundInfo(NOTIFICATION_ID, notification)
+        }
         setForeground(foregroundInfo)
 
         val result = runCatching { walletInteractor.migrate() }.getOrElse {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.6.0"
+agp = "8.7.1"
 kotlin = "1.9.24"
 appcompat = "1.7.0"
 coroutines = "1.8.1"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Jan 13 13:13:48 MSK 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/network/build.gradle.kts b/network/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {