From e613a494ffc52d46aac1532669efa3326d05e0d2 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <imranr98@pm.me>
Date: Thu, 12 Oct 2023 19:24:23 -0400
Subject: [PATCH] Better error for some incompatible APK cases (#981)

---
 lib/providers/apps_provider.dart | 36 ++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/lib/providers/apps_provider.dart b/lib/providers/apps_provider.dart
index a46a175..588ca1b 100644
--- a/lib/providers/apps_provider.dart
+++ b/lib/providers/apps_provider.dart
@@ -263,25 +263,29 @@ class AppsProvider with ChangeNotifier {
     return downloadedFile;
   }
 
-  Future<File> handleAPKIDChange(App app, PackageInfo newInfo,
+  Future<File> handleAPKIDChange(App app, PackageInfo? newInfo,
       File downloadedFile, String downloadUrl) async {
     // If the APK package ID is different from the App ID, it is either new (using a placeholder ID) or the ID has changed
     // The former case should be handled (give the App its real ID), the latter is a security issue
-    if (app.id != newInfo.packageName) {
-      var isTempId = SourceProvider().isTempId(app);
-      if (apps[app.id] != null && !isTempId && !app.allowIdChange) {
-        throw IDChangedError(newInfo.packageName!);
-      }
-      var idChangeWasAllowed = app.allowIdChange;
-      app.allowIdChange = false;
-      var originalAppId = app.id;
-      app.id = newInfo.packageName!;
-      downloadedFile = downloadedFile.renameSync(
-          '${downloadedFile.parent.path}/${app.id}-${downloadUrl.hashCode}.${downloadedFile.path.split('.').last}');
-      if (apps[originalAppId] != null) {
-        await removeApps([originalAppId]);
-        await saveApps([app], onlyIfExists: !isTempId && !idChangeWasAllowed);
+    var isTempId = SourceProvider().isTempId(app);
+    if (newInfo != null) {
+      if (app.id != newInfo.packageName) {
+        if (apps[app.id] != null && !isTempId && !app.allowIdChange) {
+          throw IDChangedError(newInfo.packageName!);
+        }
+        var idChangeWasAllowed = app.allowIdChange;
+        app.allowIdChange = false;
+        var originalAppId = app.id;
+        app.id = newInfo.packageName!;
+        downloadedFile = downloadedFile.renameSync(
+            '${downloadedFile.parent.path}/${app.id}-${downloadUrl.hashCode}.${downloadedFile.path.split('.').last}');
+        if (apps[originalAppId] != null) {
+          await removeApps([originalAppId]);
+          await saveApps([app], onlyIfExists: !isTempId && !idChangeWasAllowed);
+        }
       }
+    } else if (isTempId) {
+      throw ObtainiumError('Could not get ID from APK');
     }
     return downloadedFile;
   }
@@ -344,7 +348,7 @@ class AppsProvider with ChangeNotifier {
             await pm.getPackageArchiveInfo(archiveFilePath: apks.first.path);
       }
       downloadedFile =
-          await handleAPKIDChange(app, newInfo!, downloadedFile, downloadUrl);
+          await handleAPKIDChange(app, newInfo, downloadedFile, downloadUrl);
       // Delete older versions of the file if any
       for (var file in downloadedFile.parent.listSync()) {
         var fn = file.path.split('/').last;