Add context when deleting temp folder + Android 11 bug fix

HBiSoft · Jul 31, 2020 · 0773577 · 0773577
1 parent 2b49b48
commit 0773577
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 39 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
     defaultConfig {
         applicationId "com.hbisoft.pickitexample"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -20,10 +20,10 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation project(path: ':pickit')
 }
diff --git a/app/src/main/java/com/hbisoft/pickitexample/MainActivity.java b/app/src/main/java/com/hbisoft/pickitexample/MainActivity.java
@@ -253,7 +253,7 @@ public void PickiTonCompleteListener(String path, boolean wasDriveFile, boolean
     //  Deleting the temporary file if it exists
     @Override
     public void onBackPressed() {
-        pickiT.deleteTemporaryFile();
+        pickiT.deleteTemporaryFile(this);
         super.onBackPressed();
     }
 
@@ -264,7 +264,7 @@ public void onBackPressed() {
     public void onDestroy() {
         super.onDestroy();
         if (!isChangingConfigurations()) {
-            pickiT.deleteTemporaryFile();
+            pickiT.deleteTemporaryFile(this);
         }
     }
 

diff --git a/pickit/src/main/java/com/hbisoft/pickit/DownloadAsyncTask.java b/pickit/src/main/java/com/hbisoft/pickit/DownloadAsyncTask.java
@@ -54,6 +54,11 @@ protected String doInBackground(Uri... params) {
         Context context = mContext.get();
         if (context != null) {
             folder = context.getExternalFilesDir("Temp");
+            if (folder!= null && !folder.exists()) {
+                if (folder.mkdirs()) {
+                    Log.i("PickiT : ", "Temp folder createdd");
+                }
+            }
             returnCursor = context.getContentResolver().query(mUri, null, null, null, null);
             try {
                 is = context.getContentResolver().openInputStream(mUri);

diff --git a/pickit/src/main/java/com/hbisoft/pickit/PickiT.java b/pickit/src/main/java/com/hbisoft/pickit/PickiT.java
@@ -35,6 +35,7 @@ public void getPath(Uri uri, int APILevel){
             // Local file was selected
             else {
                 returnedPath = Utils.getRealPathFromURI_API19(context, uri);
+                Log.e("RETURNED -", ""+returnedPath);
 
                 //Get the file extension
                 final MimeTypeMap mime = MimeTypeMap.getSingleton();
@@ -67,6 +68,11 @@ public void getPath(Uri uri, int APILevel){
                                 //Copy the file to the temporary folder
                                 downloadFile(uri);
                                 return;
+                            }else if (Utils.errorReason() != null && Utils.errorReason().equals("uri")){
+                                isFromUnknownProvider = true;
+                                //Copy the file to the temporary folder
+                                downloadFile(uri);
+                                return;
                             }
                         }
                     }
@@ -84,7 +90,7 @@ public void getPath(Uri uri, int APILevel){
                     // Remember if the extension can't be found, it will not be added, but you will still be able to use the file
                     //Todo: Add checks for unknown file extensions
 
-                    if (!subStringExtension.equals(extensionFromMime) && uri.getScheme() != null && uri.getScheme().equals(ContentResolver.SCHEME_CONTENT)) {
+                    if (!subStringExtension.equals("jpeg") && !subStringExtension.equals(extensionFromMime) && uri.getScheme() != null && uri.getScheme().equals(ContentResolver.SCHEME_CONTENT)) {
                         isFromUnknownProvider = true;
                         downloadFile(uri);
                         return;
@@ -112,7 +118,7 @@ private void downloadFile(Uri uri){
     public void cancelTask(){
         if (asyntask!=null){
             asyntask.cancel(true);
-            deleteTemporaryFile();
+            deleteTemporaryFile(context);
         }
     }
 
@@ -166,7 +172,7 @@ public void PickiTonPostExecute(String path, boolean wasDriveFile, boolean wasSu
     }
 
     // Delete the temporary folder
-    public void deleteTemporaryFile(){
+    public void deleteTemporaryFile(Context context){
         File folder = context.getExternalFilesDir("Temp");
         if (folder != null) {
             if (deleteDirectory(folder)){

diff --git a/pickit/src/main/java/com/hbisoft/pickit/Utils.java b/pickit/src/main/java/com/hbisoft/pickit/Utils.java
@@ -165,32 +165,6 @@ else if (sub4.equals("Download")){
         }
     }
 
-    @SuppressLint("SdCardPath")
-    @SuppressWarnings("SpellCheckingInspection")
-    private static String[] KNOWN_SD_PATHS = new String[]{
-            "/storage/sdcard0",
-            "/storage/sdcard1",
-            "/storage/extsdcard",
-            "/storage/sdcard0/external_sdcard",
-            "/mnt/extsdcard",
-            "/mnt/sdcard/external_sd",
-            "/mnt/sdcard/ext_sd",
-            "/mnt/external_sd",
-            "/mnt/media_rw/sdcard1",
-            "/removable/microsd",
-            "/mnt/emmc",
-            "/storage/external_SD",
-            "/storage/ext_sd",
-            "/storage/removable/sdcard1",
-            "/data/sdext",
-            "/data/sdext2",
-            "/data/sdext3",
-            "/data/sdext4",
-            "/sdcard1",
-            "/sdcard2",
-            "/storage/microsd"
-    };
-
     static String getRealPathFromURI_BelowAPI19(Context context, Uri contentUri) {
         String[] proj = {MediaStore.Video.Media.DATA};
         CursorLoader loader = new CursorLoader(context, contentUri, proj, null, null, null);