Merge pull request #44 from KoalaSat/fix-app-recover-on-boot

Fix app recovery on boot
KoalaSat · Nov 14, 2024 · e26ecb4 · e26ecb4
2 parents 55d6876 + 4085b16
commit e26ecb4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/src/main/java/com/koalasat/pokey/MainActivity.kt b/app/src/main/java/com/koalasat/pokey/MainActivity.kt
@@ -24,8 +24,7 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        EncryptedStorage.init(this)
-        ExternalSigner.init(this)
+        init()
 
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
@@ -73,4 +72,9 @@ class MainActivity : AppCompatActivity() {
             }
         }
     }
+
+    fun init() {
+        EncryptedStorage.init(this)
+        ExternalSigner.init(this)
+    }
 }
diff --git a/app/src/main/java/com/koalasat/pokey/service/BootReceiver.kt b/app/src/main/java/com/koalasat/pokey/service/BootReceiver.kt
@@ -6,6 +6,7 @@ import android.content.Intent
 import android.os.Build
 import android.util.Log
 import com.koalasat.pokey.Pokey
+import com.koalasat.pokey.models.EncryptedStorage
 
 class BootReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
@@ -38,6 +39,7 @@ class BootReceiver : BroadcastReceiver() {
         if (intent.action == Intent.ACTION_BOOT_COMPLETED) {
             Log.d("BootReceiver", "Starting ConnectivityService ACTION_BOOT_COMPLETED")
             if (Pokey.isForegroundServiceEnabled(context)) {
+                EncryptedStorage.init(context)
                 context.startForegroundService(
                     Intent(
                         context,