Amend check for cordova-android 7

ReallySmallSoftware · Apr 6, 2018 · b3b7a93 · b3b7a93
1 parent 4676bfc
commit b3b7a93
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/README.MD b/README.MD
@@ -21,6 +21,9 @@ AndroidManifest.xml is automatically updated to use the new MainActivity.
 Based on cordova-android-fragments (https://github.com/rajivnarayana/CordovaFragments)
 
 # History
+## 0.0.6
+- Fix stupid cordova-android 7 detection
+
 ## 0.0.5
 - Attempt to avoid crash only seen on Galaxy J1 Ace (5.1.1)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-android-fragmentactivity",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "An android plugin that provides a replacement activity to the default activity to start a cordova application with MainActivity as a Fragment Activity. Useful when you want to add native views on top of cordova webview.",
   "cordova": {
     "id": "cordova-plugin-android-fragmentactivity",

diff --git a/plugin.xml b/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-android-fragmentactivity" version="0.0.5">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-android-fragmentactivity" version="0.0.6">
 
   <name>Cordova Android FragmentActivity Plugin</name>
   <description>An android plugin that provides a replacement activity to the default activity to start a cordova application with MainActivity as a Fragment Activity. Useful when you want to add native views on top of cordova webview.</description>

diff --git a/scripts/lib/utilities.js b/scripts/lib/utilities.js
@@ -14,19 +14,19 @@ module.exports = {
       return null;
     }
 
-    var androidPath = context.opts.projectRoot + '/platforms/android';
+    var androidPath = context.opts.projectRoot + '/platforms/android/app/src/main';
 
     if (!fs.existsSync(androidPath)) {
-      androidPath = context.opts.projectRoot + '/platforms/android/app/src/main';
+      androidPath = context.opts.projectRoot + '/platforms/android';
 
       if (!fs.existsSync(androidPath)) {
         console.log("Unable to detect type of cordova-android application structure");
         throw new Error("Unable to detect type of cordova-android application structure");
       } else {
-        console.log("Detected cordova-android 7 application structure");
+        console.log("Detected pre cordova-android 7 application structure");
       }
     } else {
-      console.log("Detected pre cordova-android 7 application structure");
+      console.log("Detected cordova-android 7 application structure");
     }
 
     return androidPath;
@@ -43,19 +43,19 @@ module.exports = {
       return null;
     }
 
-    var androidPath = context.opts.projectRoot + '/platforms/android/src';
+    var androidPath = context.opts.projectRoot + '/platforms/android/app/src/main/java';
 
     if (!fs.existsSync(androidPath)) {
-      androidPath = context.opts.projectRoot + '/platforms/android/app/src/main/java';
+      androidPath = context.opts.projectRoot + '/platforms/android/src';
 
       if (!fs.existsSync(androidPath)) {
         console.log("Unable to detect type of cordova-android application structure");
         throw new Error("Unable to detect type of cordova-android application structure");
       } else {
-        console.log("Detected cordova-android 7 application structure");
+        console.log("Detected pre cordova-android 7 application structure");
       }
     } else {
-      console.log("Detected pre cordova-android 7 application structure");
+      console.log("Detected cordova-android 7 application structure");
     }
 
     return androidPath;