git push origin bug-fixesMerge branch 'vishwesh3-bug-fixes' into bug-fixes

Author: opticod

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

@@ -18,7 +18,7 @@ public class ToolkitApplication extends Application {
 
     private static String dir;
 
-    private boolean isExternalStorageAvailable = false;
+    private static boolean isExternalStorageAvailable = false;
 
     /**
      * @return Folder path
@@ -31,6 +31,10 @@ public static String getUnZipDir() {
     @Override
     public void onCreate() {
         super.onCreate();
+        storagePathsValidate();
+    }
+
+    public void storagePathsValidate() {
         if (checkExternalStorage()) {
             isExternalStorageAvailable = true;
             dir = Environment.getExternalStorageDirectory().getAbsolutePath();
@@ -50,8 +54,6 @@ public void onCreate() {
                 f.mkdirs();
             }
         }
-
-
     }
 
     /**

source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TemplateEditor.java

@@ -1,4 +1,5 @@
 package org.buildmlearn.toolkit.activity;
+
 import android.Manifest;
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -55,7 +56,6 @@
 import java.io.IOException;
 import java.util.ArrayList;
 
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -143,6 +143,22 @@ public void onClick(View v) {
         }
     }
 
+    @Override
+    public void onRequestPermissionsResult(int requestCode,
+                                           String permissions[], int[] grantResults) {
+        switch (requestCode) {
+            case PERMISSION_REQUEST_WRITE_EXTERNAL_STORAGE_RESULT: {
+                if (grantResults.length > 0
+                        && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    ToolkitApplication mToolkitApplication = new ToolkitApplication();
+                    mToolkitApplication.storagePathsValidate();
+                }
+                return;
+            }
+
+        }
+    }
+
     /**
      * {@inheritDoc}
      */

source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadApkFragment.java

@@ -368,8 +368,7 @@ public void afterTextChanged(Editable s) {
                         SavedApi tempApi;
                         for (int i = 0; i < allsavedApis.size(); i++) {
                             if (allsavedApis.get(i).getName().contains(text)) {
-                                tempApi = new SavedApi(allsavedApis.get(i).getFile(), allsavedApis.get(i).getName(), allsavedApis.get(i).getUnformattedDate());
-                                savedApis.add(tempApi);
+                                savedApis.add(allsavedApis.get(i));
                             }
                         }
                         mAdapter.notifyDataSetChanged();

source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadProjectFragment.java

@@ -408,8 +408,7 @@ public void afterTextChanged(Editable s) {
                         SavedProject tempProject;
                         for (int i = 0; i < allsavedProjects.size(); i++) {
                             if (allsavedProjects.get(i).getName().contains(text)) {
-                                tempProject = new SavedProject(allsavedProjects.get(i).getFile(), allsavedProjects.get(i).getName(), allsavedProjects.get(i).getUnformattedDate(), allsavedProjects.get(i).getType(), allsavedProjects.get(i).getFullPath());
-                                savedProjects.add(tempProject);
+                               savedProjects.add(allsavedProjects.get(i));
                             }
                         }
                         mAdapter.notifyDataSetChanged();

source-code/app/src/main/res/values/strings.xml

@@ -250,7 +250,6 @@
     <!-- Preference Data-->
 
     <string name="project_settings">Project Settings</string>
-    <string name="key_developer_mode">debug_key</string>
     <string name="developer_mode">Developer Mode</string>
     <string name="summary_developer_mode">Developer mode disables publishing of Apk to BuildmLearn Store.</string>
     <string name="title_user_name">Enter your name</string>

source-code/app/src/main/res/xml/fragment_settings.xml

@@ -2,15 +2,6 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory android:title="@string/project_settings">
-
-        <CheckBoxPreference
-            android:key="@string/key_developer_mode"
-            android:summary="@string/summary_developer_mode"
-            android:title="@string/developer_mode" />
-
-    </PreferenceCategory>
-
     <PreferenceCategory android:title="@string/app_settings">
 
         <Preference