+ * This is used primarily for saving images, especially on removable storage. + *
+ * First, a good read: + * https://commonsware.com/blog/2017/11/13/storage-situation-internal-storage.html + * https://commonsware.com/blog/2017/11/14/storage-situation-external-storage.html + * https://commonsware.com/blog/2017/11/15/storage-situation-removable-storage.html + *
+ * The Android Storage Access Framework can be used from Android 5.0 and higher. Since Android 5.0 + * it has support for granting permissions for a directory, which we want to save our files to. + *
+ * Otherwise a fallback is provided for only saving on the primary volume with the older APIs.
+ */
+@Singleton
public class Storage {
- private static final Storage instance;
+ private StorageImpl impl;
- static {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
- instance = new Storage(new BaseStorageImpl());
+ @Inject
+ public Storage(Context applicationContext) {
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+ impl = new BaseStorageImpl(applicationContext);
} else {
- instance = new Storage(new NougatStorageImpl());
+ impl = new LollipopStorageImpl(applicationContext);
}
-
- }
-
- public static Storage getInstance() {
- return instance;
}
- private StorageImpl impl;
-
- public Storage(StorageImpl impl) {
- this.impl = impl;
+ public boolean supportsExternalStorage() {
+ return impl.supportsExternalStorage();
}
- public Intent requestExternalPermission(Context applicationContext) {
- return impl.requestExternalPermission(applicationContext);
+ public Intent getOpenTreeIntent() {
+ return impl.getOpenTreeIntent();
}
- public interface StorageImpl {
- Intent requestExternalPermission(Context applicationContext);
+ public void handleOpenTreeIntent(Uri uri) {
+ impl.handleOpenTreeIntent(uri);
}
- public static class BaseStorageImpl implements StorageImpl {
- @Override
- public Intent requestExternalPermission(Context applicationContext) {
- throw new UnsupportedOperationException();
- }
+ public StorageFile obtainStorageFileForName(String name) {
+ return impl.obtainStorageFileForName(name);
}
- @TargetApi(Build.VERSION_CODES.N)
- public static class NougatStorageImpl extends BaseStorageImpl {
- @Override
- public Intent requestExternalPermission(Context applicationContext) {
- StorageManager sm = (StorageManager)
- applicationContext.getSystemService(Context.STORAGE_SERVICE);
- Objects.requireNonNull(sm);
- for (StorageVolume storageVolume : sm.getStorageVolumes()) {
- if (!storageVolume.isPrimary()) {
- Intent accessIntent = storageVolume.createAccessIntent(null);
- return accessIntent;
- }
- }
-
- return null;
- }
+ public String currentStorageName() {
+ return impl.currentStorageName();
}
}
diff --git a/Clover/app/src/main/java/org/floens/chan/core/storage/StorageFile.java b/Clover/app/src/main/java/org/floens/chan/core/storage/StorageFile.java
new file mode 100644
index 00000000..da06db48
--- /dev/null
+++ b/Clover/app/src/main/java/org/floens/chan/core/storage/StorageFile.java
@@ -0,0 +1,93 @@
+package org.floens.chan.core.storage;
+
+import android.content.ContentResolver;
+import android.net.Uri;
+
+import org.floens.chan.utils.IOUtils;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class StorageFile {
+ private final ContentResolver contentResolver;
+ private final Uri uriOpenableByContentResolvers;
+ private final File file;
+
+ public static StorageFile fromFile(File file) {
+ return new StorageFile(file);
+ }
+
+ public static StorageFile fromUri(ContentResolver contentResolver, Uri uriOpenableByContentResolvers) {
+ return new StorageFile(contentResolver, uriOpenableByContentResolvers);
+ }
+
+ private StorageFile(ContentResolver contentResolver, Uri uriOpenableByContentResolvers) {
+ this.contentResolver = contentResolver;
+ this.uriOpenableByContentResolvers = uriOpenableByContentResolvers;
+ this.file = null;
+ }
+
+ private StorageFile(File file) {
+ this.contentResolver = null;
+ this.uriOpenableByContentResolvers = null;
+ this.file = file;
+ }
+
+ public InputStream inputStream() throws IOException {
+ if (file != null) {
+ return new FileInputStream(file);
+ } else {
+ return contentResolver.openInputStream(uriOpenableByContentResolvers);
+ }
+ }
+
+ public OutputStream outputStream() throws IOException {
+ if (file != null) {
+ File parent = file.getParentFile();
+ if (!parent.mkdirs() && !parent.isDirectory()) {
+ throw new IOException("Could not create parent directory");
+ }
+
+ if (file.isDirectory()) {
+ throw new IOException("Destination not a file");
+ }
+
+ return new FileOutputStream(file);
+ } else {
+ return contentResolver.openOutputStream(uriOpenableByContentResolvers);
+ }
+ }
+
+ public String name() {
+ return "dummy name";
+ }
+
+ public boolean exists() {
+ // TODO
+ return false;
+ }
+
+ public boolean delete() {
+ // TODO
+ return true;
+ }
+
+ public void copyFrom(File source) throws IOException {
+ InputStream is = null;
+ OutputStream os = null;
+ try {
+ is = new BufferedInputStream(new FileInputStream(source));
+ os = new BufferedOutputStream(outputStream());
+ IOUtils.copy(is, os);
+ } finally {
+ IOUtils.closeQuietly(is);
+ IOUtils.closeQuietly(os);
+ }
+ }
+}
diff --git a/Clover/app/src/main/java/org/floens/chan/core/storage/StorageImpl.java b/Clover/app/src/main/java/org/floens/chan/core/storage/StorageImpl.java
new file mode 100644
index 00000000..8bf3e711
--- /dev/null
+++ b/Clover/app/src/main/java/org/floens/chan/core/storage/StorageImpl.java
@@ -0,0 +1,16 @@
+package org.floens.chan.core.storage;
+
+import android.content.Intent;
+import android.net.Uri;
+
+public interface StorageImpl {
+ boolean supportsExternalStorage();
+
+ Intent getOpenTreeIntent();
+
+ void handleOpenTreeIntent(Uri uri);
+
+ StorageFile obtainStorageFileForName(String name);
+
+ String currentStorageName();
+}
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/activity/StartActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/StartActivity.java
index 03dd2ea5..3f7fc470 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/activity/StartActivity.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/activity/StartActivity.java
@@ -51,6 +51,7 @@ import org.floens.chan.ui.controller.BrowseController;
import org.floens.chan.ui.controller.DoubleNavigationController;
import org.floens.chan.ui.controller.DrawerController;
import org.floens.chan.ui.controller.SplitNavigationController;
+import org.floens.chan.ui.controller.StorageSetupController;
import org.floens.chan.ui.controller.StyledToolbarNavigationController;
import org.floens.chan.ui.controller.ThreadSlideController;
import org.floens.chan.ui.controller.ViewThreadController;
@@ -164,6 +165,8 @@ public class StartActivity extends AppCompatActivity implements NfcAdapter.Creat
} else {
browseController.loadWithDefaultBoard();
}
+
+ mainNavigationController.pushController(new StorageSetupController(this), false);
}
private boolean restoreFromUrl() {
@@ -487,6 +490,8 @@ public class StartActivity extends AppCompatActivity implements NfcAdapter.Creat
super.onActivityResult(requestCode, resultCode, data);
imagePickDelegate.onActivityResult(requestCode, resultCode, data);
+
+ drawerController.onActivityResult(requestCode, resultCode, data);
}
private Controller stackTop() {
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/AlbumDownloadController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/AlbumDownloadController.java
index 1450f8fa..d007e8ab 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/AlbumDownloadController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/AlbumDownloadController.java
@@ -46,6 +46,9 @@ import org.floens.chan.utils.RecyclerUtils;
import java.util.ArrayList;
import java.util.List;
+import javax.inject.Inject;
+
+import static org.floens.chan.Chan.inject;
import static org.floens.chan.ui.theme.ThemeHelper.theme;
import static org.floens.chan.utils.AndroidUtils.dp;
@@ -59,6 +62,8 @@ public class AlbumDownloadController extends Controller implements View.OnClickL
private boolean allChecked = true;
private AlbumAdapter adapter;
+
+ @Inject
private ImageSaver imageSaver;
public AlbumDownloadController(Context context) {
@@ -69,7 +74,7 @@ public class AlbumDownloadController extends Controller implements View.OnClickL
public void onCreate() {
super.onCreate();
- imageSaver = ImageSaver.getInstance();
+ inject(this);
view = inflateRes(R.layout.controller_album_download);
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java
index 7a05c547..d2324495 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java
@@ -92,6 +92,9 @@ public class ImageViewerController extends Controller implements ImageViewerPres
@Inject
ImageLoader imageLoader;
+ @Inject
+ ImageSaver imageSaver;
+
private int statusBarColorPrevious;
private AnimatorSet startAnimation;
private AnimatorSet endAnimation;
@@ -226,7 +229,7 @@ public class ImageViewerController extends Controller implements ImageViewerPres
File.separator +
presenter.getLoadable().boardCode);
}
- ImageSaver.getInstance().startDownloadTask(context, task);
+ imageSaver.startDownloadTask(context, task);
}
}
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/SaveLocationController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/SaveLocationController.java
index bd1acd51..70e48c4e 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/SaveLocationController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/SaveLocationController.java
@@ -18,9 +18,7 @@
package org.floens.chan.ui.controller;
import android.Manifest;
-import android.app.Activity;
import android.content.Context;
-import android.content.Intent;
import android.support.design.widget.FloatingActionButton;
import android.view.View;
@@ -28,7 +26,6 @@ import org.floens.chan.R;
import org.floens.chan.controller.Controller;
import org.floens.chan.core.saver.FileWatcher;
import org.floens.chan.core.settings.ChanSettings;
-import org.floens.chan.core.storage.Storage;
import org.floens.chan.ui.activity.StartActivity;
import org.floens.chan.ui.adapter.FilesAdapter;
import org.floens.chan.ui.helper.RuntimePermissionsHelper;
@@ -77,18 +74,6 @@ public class SaveLocationController extends Controller implements FileWatcher.Fi
} else {
requestPermission();
}
-
- test();
- }
-
- private void test() {
- Storage storage = Storage.getInstance();
- Intent intent = storage.requestExternalPermission(context.getApplicationContext());
- if (intent != null) {
- if (intent.resolveActivity(context.getPackageManager()) != null) {
- ((Activity) context).startActivityForResult(intent, 10024);
- }
- }
}
@Override
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/StorageSetupController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/StorageSetupController.java
new file mode 100644
index 00000000..e867ad7c
--- /dev/null
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/StorageSetupController.java
@@ -0,0 +1,79 @@
+package org.floens.chan.ui.controller;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import org.floens.chan.R;
+import org.floens.chan.controller.Controller;
+import org.floens.chan.core.storage.Storage;
+
+import javax.inject.Inject;
+
+import static org.floens.chan.Chan.inject;
+
+public class StorageSetupController extends Controller implements View.OnClickListener {
+ private static final int OPEN_TREE_INTENT_RESULT_ID = 101;
+
+ private static final String TAG = "StorageSetupController";
+
+ @Inject
+ private Storage storage;
+
+ private TextView text;
+ private Button button;
+
+ public StorageSetupController(Context context) {
+ super(context);
+ }
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+
+ inject(this);
+
+ // Navigation
+ navigation.setTitle(R.string.storage_setup_screen);
+
+ // View inflation
+ view = inflateRes(R.layout.controller_storage_setup);
+
+ // View binding
+ text = view.findViewById(R.id.text);
+ button = view.findViewById(R.id.button);
+
+ // View setup
+ button.setOnClickListener(this);
+
+ updateName();
+ }
+
+ @Override
+ public void onClick(View v) {
+ if (v == button) {
+ requestTree();
+ }
+ }
+
+ private void requestTree() {
+ Intent i = storage.getOpenTreeIntent();
+ ((Activity) context).startActivityForResult(i, OPEN_TREE_INTENT_RESULT_ID);
+ updateName();
+ }
+
+ private void updateName() {
+ text.setText(storage.currentStorageName());
+ }
+
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ if (requestCode == OPEN_TREE_INTENT_RESULT_ID && resultCode == Activity.RESULT_OK) {
+ storage.handleOpenTreeIntent(data.getData());
+ updateName();
+ }
+ }
+}
diff --git a/Clover/app/src/main/java/org/floens/chan/utils/ImageDecoder.java b/Clover/app/src/main/java/org/floens/chan/utils/ImageDecoder.java
index be6bf4f6..0c7138ad 100644
--- a/Clover/app/src/main/java/org/floens/chan/utils/ImageDecoder.java
+++ b/Clover/app/src/main/java/org/floens/chan/utils/ImageDecoder.java
@@ -25,6 +25,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStream;
/**
* Simple ImageDecoder. Taken from Volley ImageRequest.
@@ -55,26 +56,27 @@ public class ImageDecoder {
if (!file.exists())
return null;
- FileInputStream fis;
-
try {
- fis = new FileInputStream(file);
+ InputStream fis = new FileInputStream(file);
+ return decodeFile(fis, maxWidth, maxHeight);
} catch (FileNotFoundException e) {
e.printStackTrace();
return null;
}
+ }
+ public static Bitmap decodeFile(InputStream is, int maxWidth, int maxHeight) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Bitmap bitmap = null;
try {
- IOUtils.copy(fis, baos);
+ IOUtils.copy(is, baos);
bitmap = decode(baos.toByteArray(), maxWidth, maxHeight);
} catch (IOException | OutOfMemoryError e) {
e.printStackTrace();
} finally {
- IOUtils.closeQuietly(fis);
+ IOUtils.closeQuietly(is);
IOUtils.closeQuietly(baos);
}
diff --git a/Clover/app/src/main/res/layout/controller_storage_setup.xml b/Clover/app/src/main/res/layout/controller_storage_setup.xml
new file mode 100644
index 00000000..257d22a4
--- /dev/null
+++ b/Clover/app/src/main/res/layout/controller_storage_setup.xml
@@ -0,0 +1,25 @@
+
+