Merge branch 'develop' into dev_to_master

# Conflicts: # Jenkinsfile # app/build.gradle # build.gradle # feature_blockexplorer_api/src/main/java/jp/co/soramitsu/feature_blockexplorer_api/data/BlockExplorerManager.kt
sora-xor · Oct 10, 2023 · 299b275 · 299b275
2 parents 1b67a1c + 405abbe
commit 299b275
Show file tree

Hide file tree

Showing 369 changed files with 4,276 additions and 2,625 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -13,7 +13,7 @@ def pipeline = new org.android.AppPipeline(steps: this,
     jobParams: jobParams,
     appPushNoti: true,
     gitUpdateSubmodule: true,
-    dockerImage: 'build-tools/android-build-box-jdk11:latest',
+    dockerImage: 'build-tools/android-build-box:jdk17',
     gpgFiles: ['app/google-services.json'],
     dojoProductType: 'sora'
     )

diff --git a/android-foundation b/android-foundation
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,6 +10,10 @@ apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.github.triplet.play'
 apply from: '../tests.gradle'
 
+kotlin {
+    jvmToolchain(11)
+}
+
 android {
     compileSdkVersion compileVersion
     flavorDimensions "default"
@@ -68,15 +72,6 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
-    }
-
     buildFeatures {
         viewBinding true
         buildConfig true
@@ -134,6 +129,7 @@ android {
     configurations {
         all*.exclude module: 'bcprov-jdk15on'
     }
+    namespace 'jp.co.soramitsu.sora'
 }
 
 hilt {
@@ -184,7 +180,6 @@ dependencies {
     implementation androidDep
     implementation appCompatResourcesDep
     implementation materialDep
-    implementation cardViewDep
     implementation constraintDep
 
     implementation navigationFragmentDep
@@ -210,7 +205,6 @@ dependencies {
     implementation platform(googleFirebaseBomDep)
     implementation googleCrashlyticsDep
 
-    implementation xNetworkingDep
     implementation webSocketLibDep
 
     implementation zXingCoreDep

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -10,6 +10,121 @@
 #Firebase Crashlytics
 -keep,includedescriptorclasses public class * extends java.lang.Exception
 
+###########
+-keep public class * extends jp.co.soramitsu.common.util.ParseModel {
+    <fields>;
+    <methods>;
+ }
+
+ # This is generated automatically by the Android Gradle plugin.
+ -dontwarn build.IgnoreJava8API
+ -dontwarn java.awt.Component
+ -dontwarn java.awt.GraphicsEnvironment
+ -dontwarn java.awt.HeadlessException
+ -dontwarn java.awt.Window
+ -dontwarn java.beans.ConstructorProperties
+ -dontwarn java.beans.Transient
+ -dontwarn java.lang.management.ManagementFactory
+ -dontwarn java.lang.management.RuntimeMXBean
+ -dontwarn java.lang.management.ThreadMXBean
+ -dontwarn javax.servlet.ServletContextListener
+ -dontwarn lombok.NonNull
+ -dontwarn org.apache.avalon.framework.logger.Logger
+ -dontwarn org.apache.log.Hierarchy
+ -dontwarn org.apache.log.Logger
+ -dontwarn org.apache.log4j.Level
+ -dontwarn org.apache.log4j.Logger
+ -dontwarn org.apache.log4j.Priority
+ -dontwarn org.apache.xml.resolver.Catalog
+ -dontwarn org.apache.xml.resolver.CatalogManager
+ -dontwarn org.apache.xml.resolver.readers.CatalogReader
+ -dontwarn org.apache.xml.resolver.readers.SAXCatalogReader
+ -dontwarn org.ietf.jgss.GSSContext
+ -dontwarn org.ietf.jgss.GSSCredential
+ -dontwarn org.ietf.jgss.GSSException
+ -dontwarn org.ietf.jgss.GSSManager
+ -dontwarn org.ietf.jgss.GSSName
+ -dontwarn org.ietf.jgss.Oid
+ -dontwarn org.slf4j.impl.StaticLoggerBinder
+ -dontwarn org.slf4j.impl.StaticMDCBinder
+ -dontwarn org.slf4j.impl.StaticMarkerBinder
+ -dontwarn org.w3c.dom.events.DocumentEvent
+ -dontwarn org.w3c.dom.events.Event
+ -dontwarn org.w3c.dom.events.EventException
+ -dontwarn org.w3c.dom.events.EventListener
+ -dontwarn org.w3c.dom.events.EventTarget
+ -dontwarn org.w3c.dom.events.MouseEvent
+ -dontwarn org.w3c.dom.events.MutationEvent
+ -dontwarn org.w3c.dom.events.UIEvent
+ -dontwarn org.w3c.dom.html.HTMLAnchorElement
+ -dontwarn org.w3c.dom.html.HTMLAppletElement
+ -dontwarn org.w3c.dom.html.HTMLAreaElement
+ -dontwarn org.w3c.dom.html.HTMLBRElement
+ -dontwarn org.w3c.dom.html.HTMLBaseElement
+ -dontwarn org.w3c.dom.html.HTMLBaseFontElement
+ -dontwarn org.w3c.dom.html.HTMLBodyElement
+ -dontwarn org.w3c.dom.html.HTMLButtonElement
+ -dontwarn org.w3c.dom.html.HTMLCollection
+ -dontwarn org.w3c.dom.html.HTMLDListElement
+ -dontwarn org.w3c.dom.html.HTMLDirectoryElement
+ -dontwarn org.w3c.dom.html.HTMLDivElement
+ -dontwarn org.w3c.dom.html.HTMLDocument
+ -dontwarn org.w3c.dom.html.HTMLElement
+ -dontwarn org.w3c.dom.html.HTMLFieldSetElement
+ -dontwarn org.w3c.dom.html.HTMLFontElement
+ -dontwarn org.w3c.dom.html.HTMLFormElement
+ -dontwarn org.w3c.dom.html.HTMLFrameElement
+ -dontwarn org.w3c.dom.html.HTMLFrameSetElement
+ -dontwarn org.w3c.dom.html.HTMLHRElement
+ -dontwarn org.w3c.dom.html.HTMLHeadElement
+ -dontwarn org.w3c.dom.html.HTMLHeadingElement
+ -dontwarn org.w3c.dom.html.HTMLHtmlElement
+ -dontwarn org.w3c.dom.html.HTMLIFrameElement
+ -dontwarn org.w3c.dom.html.HTMLImageElement
+ -dontwarn org.w3c.dom.html.HTMLInputElement
+ -dontwarn org.w3c.dom.html.HTMLIsIndexElement
+ -dontwarn org.w3c.dom.html.HTMLLIElement
+ -dontwarn org.w3c.dom.html.HTMLLabelElement
+ -dontwarn org.w3c.dom.html.HTMLLegendElement
+ -dontwarn org.w3c.dom.html.HTMLLinkElement
+ -dontwarn org.w3c.dom.html.HTMLMapElement
+ -dontwarn org.w3c.dom.html.HTMLMenuElement
+ -dontwarn org.w3c.dom.html.HTMLMetaElement
+ -dontwarn org.w3c.dom.html.HTMLModElement
+ -dontwarn org.w3c.dom.html.HTMLOListElement
+ -dontwarn org.w3c.dom.html.HTMLObjectElement
+ -dontwarn org.w3c.dom.html.HTMLOptGroupElement
+ -dontwarn org.w3c.dom.html.HTMLOptionElement
+ -dontwarn org.w3c.dom.html.HTMLParagraphElement
+ -dontwarn org.w3c.dom.html.HTMLParamElement
+ -dontwarn org.w3c.dom.html.HTMLPreElement
+ -dontwarn org.w3c.dom.html.HTMLQuoteElement
+ -dontwarn org.w3c.dom.html.HTMLScriptElement
+ -dontwarn org.w3c.dom.html.HTMLSelectElement
+ -dontwarn org.w3c.dom.html.HTMLStyleElement
+ -dontwarn org.w3c.dom.html.HTMLTableCaptionElement
+ -dontwarn org.w3c.dom.html.HTMLTableCellElement
+ -dontwarn org.w3c.dom.html.HTMLTableColElement
+ -dontwarn org.w3c.dom.html.HTMLTableElement
+ -dontwarn org.w3c.dom.html.HTMLTableRowElement
+ -dontwarn org.w3c.dom.html.HTMLTableSectionElement
+ -dontwarn org.w3c.dom.html.HTMLTextAreaElement
+ -dontwarn org.w3c.dom.html.HTMLTitleElement
+ -dontwarn org.w3c.dom.html.HTMLUListElement
+ -dontwarn org.w3c.dom.ls.LSSerializerFilter
+ -dontwarn org.w3c.dom.ranges.DocumentRange
+ -dontwarn org.w3c.dom.ranges.Range
+ -dontwarn org.w3c.dom.ranges.RangeException
+ -dontwarn org.w3c.dom.traversal.DocumentTraversal
+ -dontwarn org.w3c.dom.traversal.NodeFilter
+ -dontwarn org.w3c.dom.traversal.NodeIterator
+ -dontwarn org.w3c.dom.traversal.TreeWalker
+ -dontwarn org.web3j.abi.datatypes.generated.AbiTypes
+ -dontwarn org.webrtc.Dav1dDecoder
+ -dontwarn sun.security.x509.X509Key
+
+-dontwarn java.lang.invoke.StringConcatFactory
+
 # Gson
 -keep,allowobfuscation,allowoptimization class * {
     @com.google.gson.annotations.SerializedName <fields>;
@@ -60,3 +175,17 @@
 # Needed by google-play-services when linking against an older platform version
 
 -dontwarn com.google.android.gms.**
+
+-keep class com.google.** { *;}
+-keep interface com.google.** { *;}
+-dontwarn com.google.**
+
+-dontwarn sun.misc.Unsafe
+-dontwarn com.google.common.collect.MinMaxPriorityQueue
+-keepattributes *Annotation*,Signature
+-keep class * extends com.google.api.client.json.GenericJson {
+*;
+}
+-keep class com.google.api.services.drive.** {
+*;
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="jp.co.soramitsu.sora">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -26,7 +25,6 @@
         <activity
             android:name=".splash.presentation.SplashActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/SplashTheme"
             android:exported="true">
 
             <intent-filter>
@@ -55,7 +53,6 @@
 
         <activity
             android:name="jp.co.soramitsu.feature_assets_impl.presentation.screens.scan.QRCodeScannerActivity"
-            android:theme="@style/SplashTheme"
             android:exported="false"/>
 
         <meta-data

diff --git a/app/src/main/java/jp/co/soramitsu/sora/SoraApp.kt b/app/src/main/java/jp/co/soramitsu/sora/SoraApp.kt
@@ -41,6 +41,7 @@ import coil.decode.SvgDecoder
 import com.google.firebase.FirebaseApp
 import dagger.hilt.android.HiltAndroidApp
 import javax.inject.Inject
+import jp.co.soramitsu.common.domain.DarkThemeManager
 import jp.co.soramitsu.common.domain.OptionsProvider
 import jp.co.soramitsu.common.io.FileManager
 import jp.co.soramitsu.common.resourses.ResourceManager
@@ -68,6 +69,9 @@ open class SoraApp : Application(), Configuration.Provider, ImageLoaderFactory {
     @Inject
     lateinit var workerFactory: HiltWorkerFactory
 
+    @Inject
+    lateinit var darkThemeManager: DarkThemeManager
+
     override fun newImageLoader(): ImageLoader {
         val loader = ImageLoader.Builder(this).components {
             add(svg)
@@ -91,6 +95,8 @@ open class SoraApp : Application(), Configuration.Provider, ImageLoaderFactory {
         OptionsProvider.CURRENT_VERSION_CODE = BuildConfig.VERSION_CODE
         OptionsProvider.CURRENT_VERSION_NAME = BuildConfig.VERSION_NAME
         OptionsProvider.APPLICATION_ID = BuildConfig.APPLICATION_ID
+
+        darkThemeManager.updateUiModeFromCache()
     }
 
     private fun initLogger() {

diff --git a/app/src/main/java/jp/co/soramitsu/sora/navigation/Navigator.kt b/app/src/main/java/jp/co/soramitsu/sora/navigation/Navigator.kt
@@ -69,7 +69,7 @@ import jp.co.soramitsu.feature_select_node_api.SelectNodeRouter
 import jp.co.soramitsu.feature_select_node_impl.presentation.nodeAddress
 import jp.co.soramitsu.feature_select_node_impl.presentation.nodeName
 import jp.co.soramitsu.feature_select_node_impl.presentation.pinCodeChecked
-import jp.co.soramitsu.feature_sora_card_impl.presentation.get.card.GetSoraCardFragment
+import jp.co.soramitsu.feature_sora_card_impl.presentation.GetSoraCardFragment
 import jp.co.soramitsu.feature_wallet_api.launcher.WalletRouter
 import jp.co.soramitsu.sora.R
 
@@ -136,7 +136,7 @@ class Navigator :
     }
 
     override fun popBackStackToAccountDetails() {
-        navController?.popBackStack(R.id.accoundDetailsFragment, false)
+        navController?.popBackStack(R.id.accountDetailsFragment, false)
     }
 
     override fun showSelectLanguage() {
@@ -317,7 +317,7 @@ class Navigator :
 
     override fun showAccountList() {
         navController?.navigate(
-            R.id.export_account_nav_graph,
+            R.id.accountListFragment,
             null,
         )
     }
@@ -355,7 +355,7 @@ class Navigator :
 
     override fun showAccountDetails(address: String) {
         navController?.navigate(
-            R.id.accoundDetailsFragment,
+            R.id.accountDetailsFragment,
             withArgs {
                 this.address = address
             },

diff --git a/app/src/main/java/jp/co/soramitsu/sora/splash/domain/MigrationManager.kt b/app/src/main/java/jp/co/soramitsu/sora/splash/domain/MigrationManager.kt
@@ -61,7 +61,7 @@ class MigrationManager @Inject constructor(
                 credentialsRepository.saveMnemonic(mnemonic, soraAccount)
                 val soraKeys = credentialsRepository.retrieveKeyPair(emptySoraAccount)
                 credentialsRepository.saveKeyPair(soraKeys, soraAccount)
-                userRepository.insertSoraAccount(soraAccount)
+                userRepository.insertSoraAccount(soraAccount, false)
                 userRepository.setCurSoraAccount(soraAccount)
                 FirebaseWrapper.log("Migration ma done")
             }

diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
@@ -5,7 +5,7 @@
     android:id="@+id/splashContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/neu_color_100">
+    android:background="?attr/baseBackground">
 
     <com.airbnb.lottie.LottieAnimationView
         android:id="@+id/animation_view"
@@ -27,7 +27,7 @@
         android:visibility="gone"
         android:textStyle="bold"
         android:fontFamily="@font/sora_bold"
-        android:textColor="@color/neu_black_default"
+        android:textColor="?attr/secondaryBackground"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/navigation/main_nav_graph.xml b/app/src/main/res/navigation/main_nav_graph.xml
@@ -75,13 +75,37 @@
 
     <fragment
         android:id="@+id/soraCardDetailsFragment"
-        android:name="jp.co.soramitsu.feature_sora_card_impl.presentation.get.card.details.SoraCardDetailsFragment" />
+        android:name="jp.co.soramitsu.feature_sora_card_impl.presentation.details.SoraCardDetailsFragment" />
+
+    <fragment
+        android:id="@+id/accountDetailsFragment"
+        android:name="jp.co.soramitsu.feature_multiaccount_impl.presentation.export_account.account_details.AccountDetailsFragment"
+        android:label="AccountDetailsFragment" />
+
+    <fragment
+        android:id="@+id/accountListFragment"
+        android:name="jp.co.soramitsu.feature_multiaccount_impl.presentation.export_account.account_list.AccountListFragment"
+        android:label="AccountListFragment" />
+
+    <fragment
+        android:id="@+id/exportProtectionFragment"
+        android:name="jp.co.soramitsu.feature_multiaccount_impl.presentation.export_account.protection.ExportProtectionFragment"
+        android:label="ExportProtectionFragment" />
+
+    <fragment
+        android:id="@+id/backupFragment"
+        android:name="jp.co.soramitsu.feature_multiaccount_impl.presentation.export_account.backup.BackupFragment"
+        android:label="BackupFragment" />
+
+    <fragment
+        android:id="@+id/backupJsonFragment"
+        android:name="jp.co.soramitsu.feature_multiaccount_impl.presentation.export_account.backup.json.BackupJsonFragment"
+        android:label="BackupJsonFragment" />
 
     <include app:graph="@navigation/activities_nav_graph" />
     <include app:graph="@navigation/profile_nav_graph" />
     <include app:graph="@navigation/wallet_nav_graph" />
     <include app:graph="@navigation/referral_nav_graph" />
-    <include app:graph="@navigation/export_account_nav_graph" />
     <include app:graph="@navigation/select_node_nav_graph" />
     <include app:graph="@navigation/sora_card_nav_graph" />
+12 −8		build.gradle
+37 −0		src/main/java/jp/co/soramitsu/androidfoundation/intent/IntentUtils.kt