handle android 30 when save local storage and bump up version 1.3.27

qiscus · Jan 25, 2021 · 9445a15 · 9445a15
1 parent a78bc4f
commit 9445a15
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -18,11 +18,11 @@ apply plugin: 'com.android.application'
 apply from: rootProject.file('gradle/quality.gradle')
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         applicationId "com.qiscus.dragonfly"
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         multiDexEnabled true

diff --git a/chat-core/src/main/java/com/qiscus/sdk/chat/core/util/QiscusFileUtil.java b/chat-core/src/main/java/com/qiscus/sdk/chat/core/util/QiscusFileUtil.java
@@ -19,6 +19,7 @@
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Environment;
 import android.provider.MediaStore;
 import android.provider.OpenableColumns;
@@ -160,7 +161,13 @@ public static File saveFile(File file) {
 
     public static String generateFilePath(String fileName) {
         String[] fileNameSplit = splitFileName(fileName);
-        return generateFilePath(fileName, fileNameSplit[1]);
+
+        int androidVersion = Build.VERSION.SDK_INT;
+        if (androidVersion >= 30) {
+            return generateFilePath(fileName, fileNameSplit[1], getEnvironment(fileName));
+        } else {
+            return generateFilePath(fileName, fileNameSplit[1]);
+        }
     }
 
     public static String generateFilePath(String fileName, String extension) {
@@ -188,6 +195,32 @@ public static String generateFilePath(String fileName, String extension) {
         }
     }
 
+    //api >=30
+    public static String generateFilePath(String fileName, String extension, String environment) {
+        File file = new File(Environment.getExternalStoragePublicDirectory(environment),
+                isImage(fileName) ? IMAGE_PATH : FILES_PATH);
+
+        if (!file.exists()) {
+            file.mkdirs();
+        }
+
+        int index = 0;
+        String directory = file.getAbsolutePath() + File.separator;
+        String[] fileNameSplit = splitFileName(fileName);
+        while (true) {
+            File newFile;
+            if (index == 0) {
+                newFile = new File(directory + fileNameSplit[0] + extension);
+            } else {
+                newFile = new File(directory + fileNameSplit[0] + "-" + index + extension);
+            }
+            if (!newFile.exists()) {
+                return newFile.getAbsolutePath();
+            }
+            index++;
+        }
+    }
+
     public static boolean isImage(String fileName) {
         String type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(getExtension(fileName));
         if (type == null) {
@@ -199,6 +232,26 @@ public static boolean isImage(String fileName) {
         return false;
     }
 
+    public static String getEnvironment(String fileName) {
+        String type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(getExtension(fileName));
+        if (type == null) {
+            return Environment.DIRECTORY_DOWNLOADS;
+        } else if (type.contains("image")) {
+            return Environment.DIRECTORY_PICTURES;
+        } else if (type.contains("video")) {
+            return Environment.DIRECTORY_MOVIES;
+        } else if (type.contains("audio")) {
+            return Environment.DIRECTORY_MUSIC;
+        } else {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                return Environment.DIRECTORY_DOCUMENTS;
+            } else {
+                return Environment.DIRECTORY_DOWNLOADS;
+            }
+        }
+    }
+
+
     public static File rename(File file, String newName) {
         File newFile = new File(file.getParent(), newName);
         if (!newFile.equals(file)) {

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -28,11 +28,11 @@ repositories {
 ext {
 
     minSDKVersion = 16
-    targetSDKVersion = 29
-    compileSDKVersion = 29
+    targetSDKVersion = 30
+    compileSDKVersion = 30
 
     versions = [
-            support          : "28.0.0",
+            support          : "30.0.0",
             firebaseCore     : "17.2.2",
             firebaseMessaging: "20.1.0",
             okHttp           : "3.12.5",

diff --git a/gradle.properties b/gradle.properties
@@ -41,7 +41,7 @@ chatVersionPatch=17
 # === qiscus chat-core library version ===
 chatCoreVersionMajor=1
 chatCoreVersionMinor=3
-chatCoreVersionPatch=26
+chatCoreVersionPatch=27
 
 # === qiscus default base url
 BASE_URL_SERVER="https://api.qiscus.com/"