Refactored targetSdkVersionFromManifest

appium · Dec 6, 2016 · 478d97e · 478d97e
1 parent f2876e6
commit 478d97e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/tools/android-manifest.js b/lib/tools/android-manifest.js
@@ -96,9 +96,12 @@ manifestMethods.targetSdkVersionFromManifest = async function (localApk) {
     let args = ['dump', 'badging', localApk];
     let {stdout} = await exec(this.binaries.aapt, args);
     let targetSdkVersion = new RegExp(/targetSdkVersion:'([^']+)'/g).exec(stdout);
+    if (!targetSdkVersion) {
+      throw new Error(`targetSdkVersion is not specified in the application.`);
+    }
     return parseInt(targetSdkVersion[1], 10);
   } catch (e) {
-    log.errorAndThrow(`targetSdkVersionFromManifest failed. Original error: ${e.message}`);
+    log.errorAndThrow(`fetching targetSdkVersion from local APK failed. Original error: ${e.message}`);
   }
 };
 

diff --git a/lib/tools/apk-utils.js b/lib/tools/apk-utils.js
@@ -193,8 +193,14 @@ apkUtilsMethods.install = async function (apk, replace = true, timeout = 60000)
   }
   if (apk.includes('.apk')) {
     let apiLevel = await this.getApiLevel();
-    let targetSdk = await this.targetSdkVersionFromManifest(apk);
-    if (apiLevel >= 23 && targetSdk >= 23) {
+    let targetSdk = null;
+    try {
+      targetSdk = await this.targetSdkVersionFromManifest(apk);
+    } catch (e) {
+      //avoiding logging error stack, as calling library function would have logged
+      log.warn(`Ran into problem getting target SDK version; ignoring...`);
+    }
+    if (apiLevel >= 23 && (!targetSdk || targetSdk >= 23)) {
       await this.grantAllPermissions(await this.getPackageName(apk));
     }
   }