Seperatley handle Android 11 and old versions

Also, improve permission handling

Signed-off-by: sunilpaulmathew <sunil.kde@gmail.com>

Author: sunilpaulmathew

app/src/main/java/com/smartpack/scriptmanager/MainActivity.java

@@ -13,6 +13,7 @@
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
@@ -61,13 +62,17 @@ protected void onCreate(Bundle savedInstanceState) {
         });
 
         mFab.setOnClickListener(v -> {
-            if (!Utils.checkWriteStoragePermission(this)) {
-                ActivityCompat.requestPermissions(this, new String[]{
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE},1);
-                Utils.snackbar(findViewById(android.R.id.content), getString(R.string.permission_denied_write_storage));
-                return;
+            if (Build.VERSION.SDK_INT >= 30) {
+                Scripts.createScript(this);
+            } else {
+                if (!Utils.checkWriteStoragePermission(this)) {
+                    ActivityCompat.requestPermissions(this, new String[]{
+                            Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
+                    Utils.snackbar(findViewById(android.R.id.content), getString(R.string.permission_denied_write_storage));
+                    return;
+                }
+                Utils.fabMenu(mFab, this);
             }
-            Utils.fabMenu(mFab, this);
         });
 
         mInfo.setOnClickListener(v -> {

app/src/main/java/com/smartpack/scriptmanager/activities/FilePickerActivity.java

@@ -253,7 +253,7 @@ public void onBindViewHolder(@NonNull RecycleViewAdapter.ViewHolder holder, int
                     holder.mLinearLayout.setOnLongClickListener(v -> {
                         Scripts.mScriptName = new File(this.data.get(position)).getName();
                         Scripts.mScriptPath = this.data.get(position);
-                        Scripts.createScript(holder.mLinearLayout.getContext());
+                        Scripts.launchCreateScriptActivity(holder.mLinearLayout.getContext());
                         return false;
                     });
                 } else {

app/src/main/java/com/smartpack/scriptmanager/adapters/RecycleViewAdapter.java

@@ -116,7 +116,7 @@ public void onClick(View view) {
                                 .show();
                         break;
                     case 1:
-                        Scripts.createScript(view.getContext());
+                        Scripts.launchCreateScriptActivity(view.getContext());
                         break;
                     case 2:
                         Scripts.shareScript(view.getContext());

app/src/main/java/com/smartpack/scriptmanager/utils/Scripts.java

@@ -104,7 +104,32 @@ public static void createScript(String file, String text, Context context) {
         Utils.create(text, file);
     }
 
-    public static void createScript(Context context) {
+    public static void createScript(Activity activity) {
+        Utils.dialogEditText(null,
+                (dialogInterface, i) -> {
+                }, text -> {
+                    if (text.isEmpty()) {
+                        Utils.snackbar(activity.findViewById(android.R.id.content), activity.getString(R.string.name_empty));
+                        return;
+                    }
+                    if (!text.endsWith(".sh")) {
+                        text += ".sh";
+                    }
+                    if (text.contains(" ")) {
+                        text = text.replace(" ", "_");
+                    }
+                    if (Utils.exist(scriptExistsCheck(text, activity))) {
+                        Utils.snackbar(activity.findViewById(android.R.id.content), activity.getString(R.string.script_exists, text));
+                        return;
+                    }
+                    mScriptName = text;
+                    mScriptPath = null;
+                    launchCreateScriptActivity(activity);
+                }, activity).setOnDismissListener(dialogInterface -> {
+        }).show();
+    }
+
+    public static void launchCreateScriptActivity(Context context) {
         mOutput = new ArrayList<>();
         Intent intent = new Intent(context, CreateScriptActivity.class);
         context.startActivity(intent);
@@ -211,7 +236,7 @@ public static void loadUI(Activity activity) {
         try {
             Scripts.mRecycleViewAdapter = new RecycleViewAdapter(Scripts.getData(activity));
         } catch (RuntimeException ignored) {}
-        if (Utils.checkWriteStoragePermission(activity)) {
+        if (Build.VERSION.SDK_INT >= 30 || Utils.checkWriteStoragePermission(activity)) {
             Scripts.mRecyclerView.setAdapter(Scripts.mRecycleViewAdapter);
         } else {
             ActivityCompat.requestPermissions(activity, new String[] {

app/src/main/java/com/smartpack/scriptmanager/utils/Utils.java

@@ -395,41 +395,16 @@ public static void fabMenu(FloatingActionButton button, Activity activity) {
         popupMenu.setOnMenuItemClickListener(item -> {
             switch (item.getItemId()) {
                 case 0:
-                    Utils.dialogEditText(null,
-                            (dialogInterface, i) -> {
-                            }, text -> {
-                                if (text.isEmpty()) {
-                                    Utils.snackbar(activity.findViewById(android.R.id.content), activity.getString(R.string.name_empty));
-                                    return;
-                                }
-                                if (!text.endsWith(".sh")) {
-                                    text += ".sh";
-                                }
-                                if (text.contains(" ")) {
-                                    text = text.replace(" ", "_");
-                                }
-                                if (Utils.exist(Scripts.scriptExistsCheck(text, activity))) {
-                                    Utils.snackbar(activity.findViewById(android.R.id.content), activity.getString(R.string.script_exists, text));
-                                    return;
-                                }
-                                Scripts.mScriptName = text;
-                                Scripts.mScriptPath = null;
-                                Scripts.createScript(activity);
-                            }, activity).setOnDismissListener(dialogInterface -> {
-                    }).show();
+                    Scripts.createScript(activity);
                     break;
                 case 1:
-                    if (Build.VERSION.SDK_INT >= 30) {
-                        Utils.snackbar(activity.findViewById(android.R.id.content), "This feature is not yet available on Android 11!");
+                    if (Utils.getBoolean("use_file_picker", true, activity)) {
+                        Intent filePicker = new Intent(activity, FilePickerActivity.class);
+                        activity.startActivity(filePicker);
                     } else {
-                        if (Utils.getBoolean("use_file_picker", true, activity)) {
-                            Intent filePicker = new Intent(activity, FilePickerActivity.class);
-                            activity.startActivity(filePicker);
-                        } else {
-                            Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-                            intent.setType("*/*");
-                            activity.startActivityForResult(intent, 0);
-                        }
+                        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+                        intent.setType("*/*");
+                        activity.startActivityForResult(intent, 0);
                     }
                     break;
             }