Add support for Android M (with new permission modes). Resolves #20 and resolves #12

Author: niranjan94

app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.njlabs.showjava">
 
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

app/src/main/java/com/njlabs/showjava/Constants.java

@@ -11,7 +11,7 @@ public final class Constants {
     public static final String PROCESS_DIR = "com.njlabs.showjava.process.DIR";
     public static final String PROCESS_PACKAGE_ID = "com.njlabs.showjava.process.PACKAGE_ID";
     public static final int PROCESS_NOTIFICATION_ID = 1;
-
+    public static final int STORAGE_PERMISSION_REQUEST = 3;
     public interface ACTION {
         String START_PROCESS = "com.njlabs.showjava.process.action.START";
         String STOP_PROCESS = "com.njlabs.showjava.process.action.STOP";

app/src/main/java/com/njlabs/showjava/ui/BaseActivity.java

@@ -138,6 +138,10 @@ public boolean isLollipop() {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
     }
 
+    public boolean isMarshmallow() {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
+    }
+
     public boolean isPro() {
         return BuildConfig.IS_PRO;
     }

app/src/main/java/com/njlabs/showjava/ui/Landing.java

@@ -1,5 +1,6 @@
 package com.njlabs.showjava.ui;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -14,6 +15,9 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
+import android.support.annotation.NonNull;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
 import android.view.View;
 import android.view.ViewGroup;
@@ -23,6 +27,7 @@
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.mikepenz.materialdrawer.Drawer;
 import com.mikepenz.materialdrawer.DrawerBuilder;
@@ -33,6 +38,7 @@
 import com.mikepenz.materialdrawer.model.ProfileDrawerItem;
 import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
 import com.njlabs.showjava.BuildConfig;
+import com.njlabs.showjava.Constants;
 import com.njlabs.showjava.R;
 import com.njlabs.showjava.utils.SourceInfo;
 import com.njlabs.showjava.utils.Utils;
@@ -113,11 +119,23 @@ public boolean onItemClick(AdapterView<?> parent, View view, int position, long
                 .withCloseOnClick(true)
                 .build();
 
+        if(isMarshmallow()){
+            if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+                ActivityCompat.requestPermissions(this,  new String[]{ Manifest.permission.WRITE_EXTERNAL_STORAGE }, Constants.STORAGE_PERMISSION_REQUEST);
+            } else {
+                initHistoryLoader();
+            }
+        } else {
+            initHistoryLoader();
+        }
+
 
+    }
+
+    public void initHistoryLoader(){
         HistoryLoader historyLoader = new HistoryLoader();
         historyLoader.execute();
     }
-
     public void SetupList(List<SourceInfo> AllPackages) {
 
         if (AllPackages.size() < 1) {
@@ -370,4 +388,19 @@ protected void onProgressUpdate(String... text) {
         }
     }
 
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
+        switch (requestCode) {
+            case Constants.STORAGE_PERMISSION_REQUEST: {
+                if (grantResults.length > 0
+                        && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    initHistoryLoader();
+                } else {
+                    Toast.makeText(baseContext, "Storage permission is required to use this app", Toast.LENGTH_LONG).show();
+                    finish();
+                }
+            }
+
+        }
+    }
 }