(#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 {
     // !!! IMPORTANT !!!
@@ -72,6 +75,10 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    kotlinOptions {
+        freeCompilerArgs = ["-Xallow-result-return-type"]
+    }
+
     lintOptions {
         abortOnError false
     }
@@ -215,6 +222,10 @@ dependencies {
     implementation 'com.vdurmont:emoji-java:5.1.0'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.12'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'com.github.K1rakishou:Fuck-Storage-Access-Framework:v1.0-alpha'
+
+    testImplementation 'junit:junit:4.12'
 }
 
 //========================================================

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

@@ -61,6 +61,10 @@
 import com.github.adamantcheese.chan.ui.theme.ThemeHelper;
 import com.github.adamantcheese.chan.utils.AndroidUtils;
 import com.github.adamantcheese.chan.utils.Logger;
+import com.github.k1rakishou.fsaf.FileChooser;
+import com.github.k1rakishou.fsaf.callback.FSAFActivityCallbacks;
+
+import org.jetbrains.annotations.NotNull;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -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,
+        FSAFActivityCallbacks {
     private static final String TAG = "StartActivity";
 
     private static final String STATE_KEY = "chan_state";
@@ -94,15 +101,14 @@ public class StartActivity extends AppCompatActivity implements NfcAdapter.Creat
 
     @Inject
     DatabaseManager databaseManager;
-
     @Inject
     WatchManager watchManager;
-
     @Inject
     SiteResolver siteResolver;
-
     @Inject
     SiteService siteService;
+    @Inject
+    FileChooser fileChooser;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -115,6 +121,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         Chan.injector().instance(ThemeHelper.class).setupContext(this);
 
+        fileChooser.setCallbacks(this);
+
         imagePickDelegate = new ImagePickDelegate(this);
         runtimePermissionsHelper = new RuntimePermissionsHelper(this);
         updateManager = new UpdateManager(this);
@@ -534,6 +542,8 @@ protected void onDestroy() {
             return;
         }
 
+        fileChooser.removeCallbacks();
+
         // TODO: clear whole stack?
         stackTop().onHide();
         stackTop().onDestroy();
@@ -544,7 +554,13 @@ protected void onDestroy() {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
-        imagePickDelegate.onActivityResult(requestCode, resultCode, data);
+        if (fileChooser.onActivityResult(requestCode, resultCode, data)) {
+            return;
+        }
+
+        if (imagePickDelegate.onActivityResult(requestCode, resultCode, data)) {
+            return;
+        }
     }
 
     private Controller stackTop() {
@@ -581,4 +597,9 @@ public void restartApp() {
 
         Runtime.getRuntime().exit(0);
     }
+
+    @Override
+    public void fsafStartActivityForResult(@NotNull Intent intent, int requestCode) {
+        startActivityForResult(intent, requestCode);
+    }
 }

Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/cache/CacheHandler.java

@@ -24,8 +24,13 @@
 
 import com.github.adamantcheese.chan.core.settings.ChanSettings;
 import com.github.adamantcheese.chan.utils.Logger;
+import com.github.k1rakishou.fsaf.FileManager;
+import com.github.k1rakishou.fsaf.file.AbstractFile;
+import com.github.k1rakishou.fsaf.file.FileSegment;
+import com.github.k1rakishou.fsaf.file.RawFile;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -38,10 +43,11 @@ public class CacheHandler {
     private static final String TAG = "CacheHandler";
     //1GB for prefetching, so that entire threads can be loaded at once more easily, otherwise 100MB is plenty
     private static final long FILE_CACHE_DISK_SIZE = (ChanSettings.autoLoadThreadImages.get() ? 1000 : 100) * 1024 * 1024;
+    private static final String CACHE_EXTENSION = "cache";
 
     private final ExecutorService pool = Executors.newSingleThreadExecutor();
-
-    private final File directory;
+    private final FileManager fileManager;
+    private final RawFile cacheDirFile;
 
     /**
      * An estimation of the current size of the directory. Used to check if trim must be run
@@ -50,22 +56,49 @@ public class CacheHandler {
     private AtomicLong size = new AtomicLong();
     private AtomicBoolean trimRunning = new AtomicBoolean(false);
 
-    public CacheHandler(File directory) {
-        this.directory = directory;
+    public CacheHandler(FileManager fileManager, RawFile cacheDirFile) {
+        this.fileManager = fileManager;
+        this.cacheDirFile = cacheDirFile;
 
         createDirectories();
         backgroundRecalculateSize();
     }
 
     @MainThread
     public boolean exists(String key) {
-        return get(key).exists();
+        return fileManager.exists(get(key));
     }
 
     @MainThread
-    public File get(String key) {
+    public RawFile get(String key) {
         createDirectories();
-        return new File(directory, String.valueOf(key.hashCode()));
+
+        String fileName = String.format(
+                "%s.%s",
+                // We need extension here because AbstractFile expects all file names to have
+                // extensions
+                String.valueOf(key.hashCode()), CACHE_EXTENSION);
+
+        return (RawFile) cacheDirFile
+                .clone(new FileSegment(fileName));
+    }
+
+    public File randomCacheFile() throws IOException {
+        createDirectories();
+
+        File cacheDir = new File(cacheDirFile.getFullPath());
+        File newFile = new File(cacheDir, String.valueOf(System.nanoTime()));
+
+        while (newFile.exists()) {
+            newFile = new File(cacheDir, String.valueOf(System.nanoTime()));
+        }
+
+        if (!newFile.createNewFile()) {
+            throw new IOException("Could not create new file in cache directory, newFile = "
+                    + newFile.getAbsolutePath());
+        }
+
+        return newFile;
     }
 
     @MainThread
@@ -94,11 +127,11 @@ protected void fileWasAdded(long fileLen) {
     public void clearCache() {
         Logger.d(TAG, "Clearing cache");
 
-        if (directory.exists() && directory.isDirectory()) {
-            for (File file : directory.listFiles()) {
-                if (!file.delete()) {
+        if (fileManager.exists(cacheDirFile) && fileManager.isDirectory(cacheDirFile)) {
+            for (AbstractFile file : fileManager.listFiles(cacheDirFile)) {
+                if (!fileManager.delete(file)) {
                     Logger.d(TAG, "Could not delete cache file while clearing cache " +
-                            file.getName());
+                            fileManager.getName(file));
                 }
             }
         }
@@ -108,11 +141,8 @@ public void clearCache() {
 
     @MainThread
     public void createDirectories() {
-        if (!directory.exists()) {
-            if (!directory.mkdirs()) {
-                Logger.e(TAG, "Unable to create file cache dir " +
-                        directory.getAbsolutePath());
-            }
+        if (!fileManager.exists(cacheDirFile) && fileManager.create(cacheDirFile) == null) {
+            throw new RuntimeException("Unable to create file cache dir " + cacheDirFile.getFullPath());
         }
     }
 
@@ -125,62 +155,61 @@ private void backgroundRecalculateSize() {
     private void recalculateSize() {
         long calculatedSize = 0;
 
-        File[] files = directory.listFiles();
-        if (files != null) {
-            for (File file : files) {
-                calculatedSize += file.length();
-            }
+        List<AbstractFile> files = fileManager.listFiles(cacheDirFile);
+        for (AbstractFile file : files) {
+            calculatedSize += fileManager.getLength(file);
         }
 
         size.set(calculatedSize);
     }
 
     @WorkerThread
     private void trim() {
-        File[] directoryFiles = directory.listFiles();
+        List<AbstractFile> directoryFiles = fileManager.listFiles(cacheDirFile);
 
         // Don't try to trim empty directories or just one file in it.
-        if (directoryFiles == null || directoryFiles.length <= 1) {
+        if (directoryFiles.size() <= 1) {
             return;
         }
 
         // Get all files with their last modified times.
-        List<Pair<File, Long>> files = new ArrayList<>(directoryFiles.length);
-        for (File file : directoryFiles) {
-            files.add(new Pair<>(file, file.lastModified()));
+        List<Pair<AbstractFile, Long>> files = new ArrayList<>(directoryFiles.size());
+        for (AbstractFile file : directoryFiles) {
+            files.add(new Pair<>(file, fileManager.lastModified(file)));
         }
 
         // Sort by oldest first.
         Collections.sort(files, (o1, o2) -> Long.signum(o1.second - o2.second));
 
         //Pre-trim based on time, trash anything older than 6 hours
-        List<Pair<File, Long>> removed = new ArrayList<>();
-        for (Pair<File, Long> fileLongPair : files) {
+        List<Pair<AbstractFile, Long>> removed = new ArrayList<>();
+        for (Pair<AbstractFile, Long> fileLongPair : files) {
             if (fileLongPair.second + 6 * 60 * 60 * 1000 < System.currentTimeMillis()) {
-                Logger.d(TAG, "Delete for trim " + fileLongPair.first.getAbsolutePath());
-                if (!fileLongPair.first.delete()) {
+                Logger.d(TAG, "Delete for trim " + fileLongPair.first.getFullPath());
+                if (!fileManager.delete(fileLongPair.first)) {
                     Logger.e(TAG, "Failed to delete cache file for trim");
                 }
                 removed.add(fileLongPair);
             } else break; //only because we sorted earlier
         }
-        for (Pair<File, Long> deleted : removed) {
+        for (Pair<AbstractFile, Long> deleted : removed) {
             files.remove(deleted);
         }
         recalculateSize();
 
         // Trim as long as the directory size exceeds the threshold (note that oldest is still first)
         long workingSize = size.get();
         for (int i = 0; workingSize >= FILE_CACHE_DISK_SIZE; i++) {
-            File file = files.get(i).first;
+            AbstractFile file = files.get(i).first;
 
-            Logger.d(TAG, "Delete for trim " + file.getAbsolutePath());
-            workingSize -= file.length();
+            Logger.d(TAG, "Delete for trim " + file.getFullPath());
+            workingSize -= fileManager.getLength(file);
 
-            if (!file.delete()) {
+            if (!fileManager.delete(file)) {
                 Logger.e(TAG, "Failed to delete cache file for trim");
             }
         }
+
         recalculateSize();
     }
 }