💎 Bump to version 8.6.4

Author: alyezz

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v8.6.4 (2019-09-06)
+
+* Fixes missing imports in android.
+* Fixes floatingButtonEdge & floatingButtonOffset on android.
+* Adds script to automatically add our maven repo to the project level `build.gradle`
+
 ## v8.6.3 (2019-09-05)
 
 * Adds initializing android sdk from JS side using `cordova.plugins.instabug.activate`

README.md

@@ -36,7 +36,7 @@ cordova.plugins.instabug.activate(
 ```
  You can change the invocation event with any of the following: ```'button'```, ```'screenshot'```, ```'swipe'```, or ```'shake'```.
 
-2.  Make sure to add the following snippet to your project level `build.gradle`.
+2.  Make sure the following snippet is added to your project level `build.gradle`, if not you can manually add it as follows:.
 ```dart
 allprojects {
 	repositories {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "instabug-cordova",
-  "version": "8.6.3",
+  "version": "8.6.4",
   "description": "The purpose of this plugin is to simplify the process of integrating the Instabug SDK in a hybrid application, as well as to provide an interface to interfacing with the SDK through JavaScript.",
   "main": "index.js",
   "repository": {

plugin.xml

@@ -89,8 +89,8 @@
         <source-file src="src/android/IBGPlugin.java" target-dir="src/com/instabug/cordova/plugin"/>
         <!-- <source-file src="src/android/MyApplication.java" target-dir="src/com/instabug/cordova/plugin"/> -->
         <source-file src="src/android/util/Util.java" target-dir="src/com/instabug/cordova/plugin/util"/>
-        <!-- <hook type="before_plugin_install" src="scripts/android/before_plugin_install.js"/>
-        <hook type="before_plugin_uninstall" src="scripts/android/before_plugin_uninstall.js"/> -->
+        <hook type="before_plugin_install" src="scripts/android/link_gradle.js"/>
+        <hook type="before_plugin_uninstall" src="scripts/android/unlink_gradle.js"/>
     </platform>
 
     <!-- ios -->

scripts/android/link_gradle.js

@@ -0,0 +1,115 @@
+'use strict';
+var fs = require('fs');
+
+const LOG_LEVEL_SUCCESS = 0;
+const LOG_LEVEL_WARN = 1;
+
+const CHAR_OPEN_PARAN = '{';
+const CHAR_CLOSED_PARAN = '}';
+
+const GRADLE_FILE_PATH = 'platforms/android/build.gradle';
+const MAVEN_REPO_URL =
+  'https://sdks.instabug.com/nexus/repository/instabug-cp';
+
+function getPosition(string, substring, occurrenceInString) {
+  return string.split(substring, occurrenceInString).join(substring).length;
+}
+
+function findRepositoriesBlockEnd(block) {
+  let repositoriesStartBlockIndex = getPosition(block, CHAR_OPEN_PARAN, 2);
+  let count = 1;
+  let blockEndIndex = -1;
+  for (let i = repositoriesStartBlockIndex + 1; i < block.length; i++) {
+    if (block.charAt(i) === CHAR_OPEN_PARAN) {
+      count++;
+    }
+
+    if (block.charAt(i) === CHAR_CLOSED_PARAN) {
+      count--;
+    }
+
+    if (count === 0) {
+      blockEndIndex = i;
+      break;
+    }
+  }
+
+  return blockEndIndex;
+}
+
+function readFile(filePath, success) {
+  fs.readFile(filePath, 'utf-8', function(err, data) {
+    if (err) {
+      console.log(process.cwd());
+      finish(
+        LOG_LEVEL_WARN,
+        `Linking process could not be completed because of\n${err.message}`
+      );
+    }
+    success(data);
+  });
+}
+
+function writeFile(data) {
+  fs.writeFile(GRADLE_FILE_PATH, data, err => {
+    if (err) {
+      finish(
+        LOG_LEVEL_WARN,
+        `Linking process could not be completed because of\n${err.message}`
+      );
+    }
+    finish(LOG_LEVEL_SUCCESS, 'Linking process completed successfully');
+  });
+}
+
+function finish(logLevel, message) {
+  if (logLevel === LOG_LEVEL_SUCCESS) {
+    console.info(message);
+  } else {
+    console.warn(message);
+  }
+  // process.exit(0);
+}
+
+function generateNewGradleFile(data) {
+
+  if (data.includes(MAVEN_REPO_URL)) {
+    finish(LOG_LEVEL_SUCCESS, '');
+  }
+
+  const regex = /allprojects\ *\n*\ *{/;
+  if (!regex.test(data)) {
+    finish(
+      LOG_LEVEL_WARN,
+      'Something went wrong while trying to complete the linking process. '
+    );
+  }
+
+  
+  const matchedRegex = data.match(regex);
+  const block = data.substring(matchedRegex.index, data.length);
+  const blockEndIndex = findRepositoriesBlockEnd(block);
+
+  if (blockEndIndex === -1) {
+    finish(
+      LOG_LEVEL_WARN,
+      'Something went wrong while trying to complete the linking process. '
+    );
+  }
+
+  let updatedBlock = `${block.substring(0, blockEndIndex)}\tmaven {
+      \t    url "${MAVEN_REPO_URL}"
+       \t}  
+      ${block.substring(blockEndIndex, block.length)}`;
+  const newGradleFile = `${data.substring(
+    0,
+    matchedRegex.index
+  )}${updatedBlock}`;
+  return newGradleFile;
+}
+
+
+readFile(GRADLE_FILE_PATH, function(data) {
+  const newFile = generateNewGradleFile(data)
+    writeFile(newFile);
+});

scripts/android/unlink_gradle.js

@@ -0,0 +1,97 @@
+'use strict';
+var fs = require('fs');
+
+const LOG_LEVEL_SUCCESS = 0;
+const LOG_LEVEL_WARN = 1;
+
+const CHAR_OPEN_PARAN = '{';
+const CHAR_CLOSED_PARAN = '}';
+
+const GRADLE_FILE_PATH = 'platforms/android/build.gradle';
+const MAVEN_REPO_URL =
+  'https://sdks.instabug.com/nexus/repository/instabug-cp';
+
+function readFile(filePath, success) {
+  fs.readFile(filePath, 'utf-8', function(err, data) {
+    if (err) {
+      finish(
+        LOG_LEVEL_WARN,
+        `Linking process could not be completed because of\n${err.message}`
+      );
+    }
+    success(data);
+  });
+}
+
+function findClosureStart(data, index) {
+  const alphRegex = /[a-z]/;
+  let maven = '';
+  let foundOpenParan = false;
+  let closureStart = -1;
+  for (let i = index; i >= 0; i--) {
+    if (!foundOpenParan) {
+      foundOpenParan = data.charAt(i) === CHAR_OPEN_PARAN;
+    }
+
+    if (alphRegex.test(data.charAt(i)) && foundOpenParan) {
+      maven = data.charAt(i) + maven;
+    }
+    if (maven === 'maven') {
+      closureStart = i;
+      break;
+    }
+  }
+  return closureStart;
+}
+
+function findClosureEnd(data, index) {
+  const startIndex = index + MAVEN_REPO_URL.length + 2;
+  let closureEnd = -1;
+  //after
+  for (let i = startIndex; i < data.length; i++) {
+    if (data.charAt(i) === CHAR_CLOSED_PARAN) {
+      closureEnd = i;
+      break;
+    }
+  }
+  return closureEnd;
+}
+
+function removeMavenRepo(data) {
+  const regex = /\"https:\/\/sdks.instabug.com\/nexus\/repository\/instabug-cp\"/;
+  if (!regex.test(data) || !data.match(regex)) {
+    finish(LOG_LEVEL_SUCCESS, 'Already Unlinked');
+    return data;
+  } else {
+    const start = findClosureStart(data, data.match(regex).index);
+    const end = findClosureEnd(data, data.match(regex).index);
+    let newGradle =
+      data.substring(0, start) + data.substring(end + 1, data.length);
+      return newGradle;
+  } 
+}
+
+function writeFile(data) {
+  fs.writeFile(GRADLE_FILE_PATH, data, err => {
+    if (err) {
+      finish(
+        LOG_LEVEL_WARN,
+        `Unlinking process could not be completed because of\n${err.message}`
+      );
+    }
+    finish(LOG_LEVEL_SUCCESS, 'Unlinking process completed successfully');
+  });
+}
+
+function finish(logLevel, message) {
+  if (logLevel === LOG_LEVEL_SUCCESS) {
+    console.info(message);
+  } else {
+    console.warn(message);
+  }
+}
+
+readFile(GRADLE_FILE_PATH, function(data) {
+  const newGradle = removeMavenRepo(data);
+  writeFile(newGradle);
+});

src/android/IBGPlugin.java

@@ -3,6 +3,8 @@
 import android.content.Intent;
 import android.graphics.Color;
 import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 
 import com.instabug.bug.BugReporting;
@@ -303,17 +305,17 @@ private final void hasChats(CallbackContext callbackContext) {
     private final void setReportTypes(CallbackContext callbackContext, JSONArray types) {
         String[] stringArrayOfReportTypes = toStringArray(types);
         if (stringArrayOfReportTypes.length != 0) {
-                new Handler(Looper.getMainLooper()).post(new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            BugReporting.setReportTypes(Util.parseReportTypes(stringArrayOfReportTypes));
-                            callbackContext.success();
-                        } catch (Exception e) {
-                            callbackContext.error(e.getMessage());
-                        } 
+            new Handler(Looper.getMainLooper()).post(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        BugReporting.setReportTypes(Util.parseReportTypes(stringArrayOfReportTypes));
+                        callbackContext.success();
+                    } catch (Exception e) {
+                        callbackContext.error(e.getMessage());
                     }
-                });
+                }
+            });
         }
     }
 
@@ -577,6 +579,8 @@ public void run() {
                         Instabug.setPrimaryColor(colorInt);
                     }
                 });
+
+
             } catch (IllegalStateException e) {
                 callbackContext.error(errorMsg);
             }

src/android/IBGPluginActivity.java

@@ -2,6 +2,8 @@
 
 import android.os.Bundle;
 import android.util.Log;
+import android.os.Handler;
+import android.os.Looper;
 
 import com.instabug.bug.BugReporting;
 import com.instabug.library.Feature;
@@ -67,7 +69,15 @@ public void onCreate(Bundle savedInstanceState) {
      *        String representation of edge
      */
     private void setFloatingButtonEdge(String edge) {
-
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                if (edge.equals("left"))
+                    BugReporting.setFloatingButtonEdge(InstabugFloatingButtonEdge.LEFT);
+                else
+                    BugReporting.setFloatingButtonEdge(InstabugFloatingButtonEdge.RIGHT);
+            }
+        });
     }
 
     /**
@@ -77,7 +87,12 @@ private void setFloatingButtonEdge(String edge) {
      *        String representation of int offset
      */
     private void setFloatingButtonOffset(String offset) {
-
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                BugReporting.setFloatingButtonOffset(Integer.parseInt(offset));
+            }
+        });
     }
 
     /**