Fix crash issuers (#3315)

AlphaWallet · Sep 25, 2023 · a1d282f · a1d282f
1 parent 5211dc2
commit a1d282f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -274,8 +274,8 @@ dependencies {
     // Dagger 2
 
     // dagger-hilt
-    implementation "com.google.dagger:hilt-android:2.44"
-    annotationProcessor "com.google.dagger:hilt-compiler:2.44"
+    implementation "com.google.dagger:hilt-android:2.48"
+    annotationProcessor "com.google.dagger:hilt-compiler:2.48"
 
     // WebKit - for WebView Dark Mode
     implementation 'androidx.webkit:webkit:1.7.0'

diff --git a/app/src/main/java/com/alphawallet/app/repository/EthereumNetworkBase.java b/app/src/main/java/com/alphawallet/app/repository/EthereumNetworkBase.java
@@ -649,6 +649,11 @@ public void restore()
                 CustomNetworks cn = new Gson().fromJson(networks, CustomNetworks.class);
                 this.list = cn.list;
                 this.mapToTestNet = cn.mapToTestNet;
+                if (list == null)
+                {
+                    return;
+                }
+
                 checkCustomNetworkSetting();
 
                 for (NetworkInfo info : list)

diff --git a/app/src/main/java/com/alphawallet/app/ui/DappBrowserFragment.java b/app/src/main/java/com/alphawallet/app/ui/DappBrowserFragment.java
@@ -1924,7 +1924,11 @@ public void pinAuthorisation(boolean gotAuth)
 
     private void txWritten(TransactionReturn txData)
     {
-        confirmationDialog.transactionWritten(txData.hash);
+        if (confirmationDialog != null && confirmationDialog.isShowing())
+        {
+            confirmationDialog.transactionWritten(txData.hash);
+        }
+
         web3.onSignTransactionSuccessful(txData);
     }
 

diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
-        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.44'
+        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.48'
     }
 }