From bc9fbcf56c73ae8d30a2de2a870707d0e6349ac6 Mon Sep 17 00:00:00 2001
From: Apostolof <apotwohd@gmail.com>
Date: Mon, 17 Jun 2019 14:54:45 +0300
Subject: [PATCH] Fix permissions issue for Android API >28

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../activities/upload/UploadActivity.java     | 55 ++++++++++++++-----
 .../mthmmy/utils/ScrollAwareFABBehavior.java  |  3 -
 3 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1e8bf257..3f63279b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
         android:name=".base.BaseApplication"
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/upload/UploadActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/upload/UploadActivity.java
index 20fea00f..285e917f 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/upload/UploadActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/upload/UploadActivity.java
@@ -12,14 +12,6 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import androidx.core.content.FileProvider;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.preference.PreferenceManager;
-import androidx.appcompat.widget.AppCompatButton;
-import androidx.appcompat.widget.AppCompatImageButton;
 import android.text.Editable;
 import android.text.Spannable;
 import android.text.TextWatcher;
@@ -37,6 +29,16 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.appcompat.widget.AppCompatButton;
+import androidx.appcompat.widget.AppCompatImageButton;
+import androidx.core.content.FileProvider;
+import androidx.preference.PreferenceManager;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
 import net.gotev.uploadservice.MultipartUploadRequest;
 import net.gotev.uploadservice.UploadNotificationAction;
 import net.gotev.uploadservice.UploadNotificationConfig;
@@ -91,9 +93,10 @@ public class UploadActivity extends BaseActivity {
     private static final int AFR_REQUEST_CODE_FIELDS_BUILDER = 74;    //Arbitrary, application specific
 
     /**
-     * Request code to gain read/write permission
+     * Request codes to gain camera and read/write permission
      */
-    private static final int UPLOAD_REQUEST_CODE = 42;    //Arbitrary, application specific
+    private static final int UPLOAD_REQUEST_CAMERA_CODE = 42;    //Arbitrary, application specific
+    private static final int UPLOAD_REQUEST_STORAGE_CODE = 12;    //Arbitrary, application specific
 
     private static final int MAX_FILE_SIZE_SUPPORTED = 45000000;
 
@@ -111,6 +114,8 @@ public class UploadActivity extends BaseActivity {
     private CustomTextWatcher textWatcher;
     private boolean hasModifiedFilename = false;
 
+    private ZipTask zipTask;
+
     //UI elements
     private MaterialProgressBar progressBar;
     private LinearLayout categoriesSpinners;
@@ -280,7 +285,7 @@ public class UploadActivity extends BaseActivity {
             if (checkPerms())
                 takePhoto();
             else
-                requestPerms(UPLOAD_REQUEST_CODE);
+                requestPerms(UPLOAD_REQUEST_CAMERA_CODE);
         });
 
         FloatingActionButton uploadFAB = findViewById(R.id.upload_fab);
@@ -386,10 +391,18 @@ public class UploadActivity extends BaseActivity {
                         filesListArray[i] = filesList.get(i).getFileUri();
                     }
 
-                    new ZipTask(this, editTextFilename, categorySelected,
+                    zipTask = new ZipTask(this, editTextFilename, categorySelected,
                             uploadTitleText, uploadDescriptionText[0], fileIcon,
-                            uploaderProfileIndex).execute(filesListArray);
-                    finish();
+                            uploaderProfileIndex);
+
+                    if (checkPerms()) {
+                        zipTask.execute(filesListArray);
+                        finish();
+                    } else {
+                        requestPerms(UPLOAD_REQUEST_STORAGE_CODE);
+                        dialog.cancel();
+                    }
+
                     return;
                 }
 
@@ -590,10 +603,22 @@ public class UploadActivity extends BaseActivity {
     public void onRequestPermissionsResult(int permsRequestCode, @NonNull String[] permissions
             , @NonNull int[] grantResults) {
         switch (permsRequestCode) {
-            case UPLOAD_REQUEST_CODE:
+            case UPLOAD_REQUEST_CAMERA_CODE:
                 if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED)
                     takePhoto();
                 break;
+            case UPLOAD_REQUEST_STORAGE_CODE:
+                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED &&
+                    zipTask != null) {
+                    Uri[] filesListArray = new Uri[filesList.size()];
+                    for (int i = 0; i < filesList.size(); ++i) {
+                        filesListArray[i] = filesList.get(i).getFileUri();
+                    }
+
+                    zipTask.execute(filesListArray);
+                    finish();
+                }
+                break;
         }
     }
 
diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/ScrollAwareFABBehavior.java b/app/src/main/java/gr/thmmy/mthmmy/utils/ScrollAwareFABBehavior.java
index 06a355f2..44c0d4f3 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/utils/ScrollAwareFABBehavior.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/utils/ScrollAwareFABBehavior.java
@@ -38,9 +38,7 @@ public class ScrollAwareFABBehavior extends CoordinatorLayout.Behavior<FloatingA
                                final int dxUnconsumed, final int dyUnconsumed, int type) {
         super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed, dxUnconsumed,
                 dyUnconsumed, type);
-        Log.d("THISSSS", "GOT");
         if (dyConsumed > 0 || (!target.canScrollVertically(-1) && dyConsumed == 0 && dyUnconsumed > 50)) {
-            Log.d("THISSSS", "GOT_HIDE");
             child.hide(new FloatingActionButton.OnVisibilityChangedListener() {
                 @Override
                 public void onHidden(FloatingActionButton fab) {
@@ -50,7 +48,6 @@ public class ScrollAwareFABBehavior extends CoordinatorLayout.Behavior<FloatingA
             });
         } else if (child.getTag() != null && (boolean) child.getTag() && (dyConsumed < 0 ||
                 !target.canScrollVertically(-1) && dyUnconsumed < -50)) {
-            Log.d("THISSSS", "GOT_SHOW");
             child.show(new FloatingActionButton.OnVisibilityChangedListener() {
                 @Override
                 public void onShown(FloatingActionButton fab) {