From 48bd0c66ecbbfc0b1bb5369226b106209df34318 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Wed, 2 Nov 2022 15:15:36 +0700
Subject: [PATCH] fix(android/app): Add check if bundle to PackageActivity is
 null

---
 .../tavultesoft/kmapro/PackageActivity.java   | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java
index cc1a988564..86e1008e54 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java
@@ -59,17 +59,20 @@ public class PackageActivity extends AppCompatActivity implements
 
     final Context context = this;
     Bundle bundle = getIntent().getExtras();
-    if (bundle != null) {
-      kmpFile = new File(bundle.getString("kmpFile"));
-      if (!kmpFile.exists()) {
-        showErrorToast(kmpFile.getAbsolutePath() + " not found. Unable to extract");
-        return;
-      }
-      installMode = KmpInstallMode.fromString(bundle.getString("installMode"));
-      languageID = bundle.getString("language", null);
-      if (languageID != null && !languageID.isEmpty()) {
-        languageList.add(languageID);
-      }
+    if (bundle == null) {
+      showErrorToast("No bundle for PackageActivity");
+      return;
+    }
+
+    kmpFile = new File(bundle.getString("kmpFile"));
+    if (!kmpFile.exists()) {
+      showErrorToast(kmpFile.getAbsolutePath() + " not found. Unable to extract");
+      return;
+    }
+    installMode = KmpInstallMode.fromString(bundle.getString("installMode"));
+    languageID = bundle.getString("language", null);
+    if (languageID != null && !languageID.isEmpty()) {
+      languageList.add(languageID);
     }
 
     File resourceRoot =  new File(context.getDir("data", Context.MODE_PRIVATE).toString() + File.separator);