Merge branch 'fix_bug_signer' of https://github.com/scopeInfinity/BuildmLearn-Toolkit-Android into scopeInfinity-fix_bug_signer

Author: opticod

source-code/app/src/main/java/org/buildmlearn/toolkit/utilities/SignerThread.java

@@ -92,14 +92,13 @@ public SignerThread(Context context, String assetsApk, String finalApk, KeyStore
         this.projectFile = finalApk;
         this.context = context;
         this.assetsApk = assetsApk;
-        this.finalApk = finalApk.replaceAll("buildmlearn", "apk");
+        this.finalApk = getFinalApkPath(finalApk);
         this.keyDetails = keyDetails;
         this.toolkit = (ToolkitApplication) context;
         this.assetFileName = assetFileName;
         this.assetFilePath = assetFilePath;
     }
 
-
     private static void modifyManifest(final String[] args) {
         try {
             String androidManifestBinXml = args[0];
@@ -128,6 +127,12 @@ public NodeVisitor child(String ns, String name) {
         } catch (Exception e) {
             e.printStackTrace();
         }
+
+    }
+
+    private String getFinalApkPath(String buildmlearnPath) {
+        int index = buildmlearnPath.lastIndexOf("buildmlearn");
+        return buildmlearnPath.substring(0,index) + "apk";
     }
 
     public void setSignerThreadListener(OnSignComplete listener) {