(#172) Storage Access Framework Integration

Kuroba/app/build.gradle

@@ -1,4 +1,7 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion 28
@@ -154,4 +157,5 @@ dependencies {
     implementation 'com.vdurmont:emoji-java:4.0.0'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.9'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

Kuroba/app/src/main/java/com/github/adamantcheese/chan/StartActivity.java

@@ -45,6 +45,8 @@
 import com.github.adamantcheese.chan.core.model.orm.Loadable;
 import com.github.adamantcheese.chan.core.model.orm.Pin;
 import com.github.adamantcheese.chan.core.repository.SiteRepository;
+import com.github.adamantcheese.chan.core.saf.FileManager;
+import com.github.adamantcheese.chan.core.saf.callback.StartActivityCallbacks;
 import com.github.adamantcheese.chan.core.settings.ChanSettings;
 import com.github.adamantcheese.chan.core.site.Site;
 import com.github.adamantcheese.chan.core.site.SiteResolver;
@@ -62,6 +64,8 @@
 import com.github.adamantcheese.chan.utils.AndroidUtils;
 import com.github.adamantcheese.chan.utils.Logger;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
@@ -73,7 +77,10 @@
 import static com.github.adamantcheese.chan.Chan.inject;
 import static com.github.adamantcheese.chan.utils.AndroidUtils.getApplicationLabel;
 
-public class StartActivity extends AppCompatActivity implements NfcAdapter.CreateNdefMessageCallback {
+public class StartActivity
+        extends AppCompatActivity
+        implements NfcAdapter.CreateNdefMessageCallback,
+        StartActivityCallbacks {
     private static final String TAG = "StartActivity";
 
     private static final String STATE_KEY = "chan_state";
@@ -104,6 +111,9 @@ public class StartActivity extends AppCompatActivity implements NfcAdapter.Creat
     @Inject
     SiteService siteService;
 
+    @Inject
+    FileManager fileManager;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -115,6 +125,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         Chan.injector().instance(ThemeHelper.class).setupContext(this);
 
+        fileManager.setCallbacks(this);
+
         imagePickDelegate = new ImagePickDelegate(this);
         runtimePermissionsHelper = new RuntimePermissionsHelper(this);
         updateManager = new UpdateManager(this);
@@ -534,6 +546,8 @@ protected void onDestroy() {
             return;
         }
 
+        fileManager.removeCallbacks();
+
         // TODO: clear whole stack?
         stackTop().onHide();
         stackTop().onDestroy();
@@ -544,7 +558,13 @@ protected void onDestroy() {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
-        imagePickDelegate.onActivityResult(requestCode, resultCode, data);
+        if (fileManager.onActivityResult(requestCode, resultCode, data)) {
+            return;
+        }
+
+        if (imagePickDelegate.onActivityResult(requestCode, resultCode, data)) {
+            return;
+        }
     }
 
     private Controller stackTop() {
@@ -581,4 +601,9 @@ public void restartApp() {
 
         Runtime.getRuntime().exit(0);
     }
+
+    @Override
+    public void myStartActivityForResult(@NotNull Intent intent, int requestCode) {
+        startActivityForResult(intent, requestCode);
+    }
 }

Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/Extensions.kt

@@ -0,0 +1,67 @@
+package com.github.adamantcheese.chan.core
+
+import android.net.Uri
+import android.webkit.MimeTypeMap
+import java.io.File
+
+private const val BINARY_FILE_MIME_TYPE = "application/octet-stream"
+
+fun String.extension(): String? {
+    val index = this.indexOfLast { ch -> ch == '.' }
+    if (index == -1) {
+        return null
+    }
+
+    if (index == this.lastIndex) {
+        // The dot is at the very end of the string, so there is no extension
+        return null
+    }
+
+    return this.substring(index + 1)
+}
+
+fun Uri.Builder.appendManyEncoded(segments: List<String>): Uri.Builder {
+    for (segment in segments) {
+        this.appendEncodedPath(segment)
+    }
+
+    return this
+}
+
+fun Uri.removeLastSegment(): Uri? {
+    if (this.pathSegments.size <= 1) {
+        // I think we shouldn't return "/" directory here since android won't let us access it anyway
+        return null
+    }
+
+    val newSegments = this.pathSegments
+            .subList(0, pathSegments.lastIndex)
+
+    return Uri.Builder()
+            .appendManyEncoded(newSegments)
+            .build()
+}
+
+fun MimeTypeMap.getMimeFromFilename(filename: String): String {
+    val extension = filename.extension()
+    if (extension == null) {
+        return BINARY_FILE_MIME_TYPE
+    }
+
+    val mimeType = this.getMimeTypeFromExtension(extension)
+    if (mimeType == null || mimeType.isEmpty()) {
+        return BINARY_FILE_MIME_TYPE
+    }
+
+    return mimeType
+}
+
+fun File.appendMany(segments: List<String>): File {
+    var newFile = File(this.absolutePath)
+
+    for (segment in segments) {
+        newFile = File(newFile, segment)
+    }
+
+    return newFile
+}

Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/di/AppModule.java

@@ -23,6 +23,7 @@
 import com.android.volley.toolbox.ImageLoader;
 import com.github.adamantcheese.chan.core.image.ImageLoaderV2;
 import com.github.adamantcheese.chan.core.net.BitmapLruImageCache;
+import com.github.adamantcheese.chan.core.saf.FileManager;
 import com.github.adamantcheese.chan.core.saver.ImageSaver;
 import com.github.adamantcheese.chan.ui.captcha.CaptchaHolder;
 import com.github.adamantcheese.chan.ui.theme.ThemeHelper;
@@ -76,13 +77,19 @@ public ThemeHelper provideThemeHelper() {
 
     @Provides
     @Singleton
-    public ImageSaver provideImageSaver() {
-        return new ImageSaver();
+    public CaptchaHolder provideCaptchaHolder() {
+        return new CaptchaHolder();
     }
 
     @Provides
     @Singleton
-    public CaptchaHolder provideCaptchaHolder() {
-        return new CaptchaHolder();
+    public FileManager provideFileManager() {
+        return new FileManager(applicationContext);
+    }
+
+    @Provides
+    @Singleton
+    public ImageSaver provideImageSaver(FileManager fileManager) {
+        return new ImageSaver(fileManager);
     }
 }

Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/presenter/ImportExportSettingsPresenter.java

@@ -20,8 +20,7 @@
 import androidx.annotation.Nullable;
 
 import com.github.adamantcheese.chan.core.repository.ImportExportRepository;
-
-import java.io.File;
+import com.github.adamantcheese.chan.core.saf.file.ExternalFile;
 
 import javax.inject.Inject;
 
@@ -45,8 +44,8 @@ public void onDestroy() {
         this.callbacks = null;
     }
 
-    public void doExport(File settingsFile) {
-        importExportRepository.exportTo(settingsFile, new ImportExportRepository.ImportExportCallbacks() {
+    public void doExport(ExternalFile settingsFile, boolean isNewFile) {
+        importExportRepository.exportTo(settingsFile, isNewFile, new ImportExportRepository.ImportExportCallbacks() {
             @Override
             public void onSuccess(ImportExportRepository.ImportExport importExport) {
                 //called on background thread
@@ -76,7 +75,7 @@ public void onError(Throwable error, ImportExportRepository.ImportExport importE
         });
     }
 
-    public void doImport(File settingsFile) {
+    public void doImport(ExternalFile settingsFile) {
         importExportRepository.importFrom(settingsFile, new ImportExportRepository.ImportExportCallbacks() {
             @Override
             public void onSuccess(ImportExportRepository.ImportExport importExport) {