fix(app): validate installation status

Signed-off-by: Rafa Hernandez <[email protected]>
flyve-mdm · Feb 19, 2018 · 3667c51 · 3667c51
1 parent 589438c
commit 3667c51
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/app/src/main/java/org/flyve/mdm/agent/ui/InstallAppActivity.java b/app/src/main/java/org/flyve/mdm/agent/ui/InstallAppActivity.java
@@ -137,29 +137,33 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                     status = "2"; // installed
                 } else {
                     FlyveLog.d("Installation failed");
+                    finish();
                 }
         }
 
-        PackageManager packageManager = InstallAppActivity.this.getPackageManager();
-
-        PackageInfo packageInfo = packageManager.getPackageArchiveInfo(appPath, 0);
-        packageInfo.applicationInfo.sourceDir = appPath;
-        packageInfo.applicationInfo.publicSourceDir = appPath;
+        try {
+            PackageManager packageManager = InstallAppActivity.this.getPackageManager();
 
-        String appName = packageManager.getApplicationLabel(packageInfo.applicationInfo).toString();
-        String appPackage = packageInfo.packageName;
+            PackageInfo packageInfo = packageManager.getPackageArchiveInfo(appPath, 0);
+            packageInfo.applicationInfo.sourceDir = appPath;
+            packageInfo.applicationInfo.publicSourceDir = appPath;
 
+            String appName = packageManager.getApplicationLabel(packageInfo.applicationInfo).toString();
+            String appPackage = packageInfo.packageName;
 
-        AppDataBase dataBase = AppDataBase.getAppDatabase(InstallAppActivity.this);
-        Application apps = new Application();
+            AppDataBase dataBase = AppDataBase.getAppDatabase(InstallAppActivity.this);
+            Application apps = new Application();
 
-        apps.appId = id;
-        apps.appName = appName;
-        apps.appPath = appPath;
-        apps.appStatus = status; // 1 pending | 2 installed
-        apps.appPackage = appPackage;
+            apps.appId = id;
+            apps.appName = appName;
+            apps.appPath = appPath;
+            apps.appStatus = status; // 1 pending | 2 installed
+            apps.appPackage = appPackage;
 
-        dataBase.applicationDao().insert(apps);
+            dataBase.applicationDao().insert(apps);
+        } catch (Exception ex) {
+            FlyveLog.e(ex.getMessage());
+        }
 
         finish();
     }