mirror of
https://github.com/KokaKiwi/BarInsta
synced 2024-11-22 06:37:30 +00:00
remove legacy write-storage parts
This commit is contained in:
Austin Huang
parent
f657f61aa7
commit
18de019c0d
@ -115,24 +115,9 @@ public class CreateBackupDialogFragment extends DialogFragment {
|
|||||||
});
|
});
|
||||||
binding.btnSaveTo.setOnClickListener(v -> {
|
binding.btnSaveTo.setOnClickListener(v -> {
|
||||||
createFile();
|
createFile();
|
||||||
// if (ContextCompat.checkSelfPermission(context, PERMS[0]) == PackageManager.PERMISSION_GRANTED) {
|
|
||||||
// showChooser(context);
|
|
||||||
// } else {
|
|
||||||
// requestPermissions(PERMS, STORAGE_PERM_REQUEST_CODE);
|
|
||||||
// }
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onRequestPermissionsResult(final int requestCode, @NonNull final String[] permissions, @NonNull final int[] grantResults) {
|
|
||||||
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
|
||||||
// if (requestCode == STORAGE_PERM_REQUEST_CODE && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
|
|
||||||
// final Context context = getContext();
|
|
||||||
// if (context == null) return;
|
|
||||||
// showChooser(context);
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
|
public void onActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
|
||||||
if (data == null || data.getData() == null) return;
|
if (data == null || data.getData() == null) return;
|
||||||
@ -161,48 +146,8 @@ public class CreateBackupDialogFragment extends DialogFragment {
|
|||||||
}
|
}
|
||||||
dismiss();
|
dismiss();
|
||||||
});
|
});
|
||||||
// try (final OutputStream stream = context.getContentResolver().openOutputStream(data.getData())) {
|
|
||||||
// } catch (Exception e) {
|
|
||||||
// Log.e(TAG, "onActivityResult: ", e);
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// private void showChooser(@NonNull final Context context) {
|
|
||||||
// final String folderPath = Utils.settingsHelper.getString(FOLDER_PATH);
|
|
||||||
// final Editable passwordText = binding.etPassword.getText();
|
|
||||||
// final String password = binding.cbPassword.isChecked()
|
|
||||||
// && passwordText != null
|
|
||||||
// && !TextUtils.isEmpty(passwordText.toString())
|
|
||||||
// ? passwordText.toString().trim()
|
|
||||||
// : null;
|
|
||||||
// final DirectoryChooser directoryChooser = new DirectoryChooser()
|
|
||||||
// .setInitialDirectory(folderPath)
|
|
||||||
// .setInteractionListener(path -> {
|
|
||||||
// final Date now = new Date();
|
|
||||||
// final File file = new File(path, String.format("barinsta_%s.backup", BACKUP_FILE_DATE_TIME_FORMAT.format(now)));
|
|
||||||
// int flags = 0;
|
|
||||||
// if (binding.cbExportFavorites.isChecked()) {
|
|
||||||
// flags |= ExportImportUtils.FLAG_FAVORITES;
|
|
||||||
// }
|
|
||||||
// if (binding.cbExportSettings.isChecked()) {
|
|
||||||
// flags |= ExportImportUtils.FLAG_SETTINGS;
|
|
||||||
// }
|
|
||||||
// if (binding.cbExportLogins.isChecked()) {
|
|
||||||
// flags |= ExportImportUtils.FLAG_COOKIES;
|
|
||||||
// }
|
|
||||||
// ExportImportUtils.exportData(context, flags, file, password, result -> {
|
|
||||||
// if (onResultListener != null) {
|
|
||||||
// onResultListener.onResult(result);
|
|
||||||
// }
|
|
||||||
// dismiss();
|
|
||||||
// });
|
|
||||||
//
|
|
||||||
// });
|
|
||||||
// directoryChooser.setEnterTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
|
|
||||||
// directoryChooser.setExitTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
|
|
||||||
// directoryChooser.show(getChildFragmentManager(), "directory_chooser");
|
|
||||||
// }
|
|
||||||
|
|
||||||
private void createFile() {
|
private void createFile() {
|
||||||
Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
|
Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
|
||||||
intent.addCategory(Intent.CATEGORY_OPENABLE);
|
intent.addCategory(Intent.CATEGORY_OPENABLE);
|
||||||
|
|||||||
@ -40,7 +40,6 @@ public class RestoreBackupDialogFragment extends DialogFragment {
|
|||||||
private OnResultListener onResultListener;
|
private OnResultListener onResultListener;
|
||||||
|
|
||||||
private DialogRestoreBackupBinding binding;
|
private DialogRestoreBackupBinding binding;
|
||||||
// private File file;
|
|
||||||
private boolean isEncrypted;
|
private boolean isEncrypted;
|
||||||
private Uri uri;
|
private Uri uri;
|
||||||
|
|
||||||
@ -87,9 +86,6 @@ public class RestoreBackupDialogFragment extends DialogFragment {
|
|||||||
@Override
|
@Override
|
||||||
public void onRequestPermissionsResult(final int requestCode, @NonNull final String[] permissions, @NonNull final int[] grantResults) {
|
public void onRequestPermissionsResult(final int requestCode, @NonNull final String[] permissions, @NonNull final int[] grantResults) {
|
||||||
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
||||||
// if (requestCode == STORAGE_PERM_REQUEST_CODE && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
|
|
||||||
// showChooser();
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -185,56 +181,12 @@ public class RestoreBackupDialogFragment extends DialogFragment {
|
|||||||
@Override
|
@Override
|
||||||
public void afterTextChanged(final Editable s) {}
|
public void afterTextChanged(final Editable s) {}
|
||||||
});
|
});
|
||||||
// if (ContextCompat.checkSelfPermission(context, PERMS[0]) == PackageManager.PERMISSION_GRANTED) {
|
|
||||||
// showChooser();
|
|
||||||
// return;
|
|
||||||
// }
|
|
||||||
// requestPermissions(PERMS, STORAGE_PERM_REQUEST_CODE);
|
|
||||||
final Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
|
final Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
|
||||||
// intent.addCategory(Intent.CATEGORY_OPENABLE);
|
|
||||||
intent.setType("*/*");
|
intent.setType("*/*");
|
||||||
// intent.putExtra(Intent.EXTRA_MIME_TYPES, new String[]{
|
|
||||||
// "application/pdf", // .pdf
|
|
||||||
// "application/vnd.oasis.opendocument.text", // .odt
|
|
||||||
// "text/plain" // .txt
|
|
||||||
// });
|
|
||||||
startActivityForResult(intent, OPEN_FILE_REQUEST_CODE);
|
startActivityForResult(intent, OPEN_FILE_REQUEST_CODE);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// private void showChooser() {
|
|
||||||
// final String folderPath = Utils.settingsHelper.getString(FOLDER_PATH);
|
|
||||||
// final Context context = getContext();
|
|
||||||
// if (context == null) return;
|
|
||||||
// final DirectoryChooser directoryChooser = new DirectoryChooser()
|
|
||||||
// .setInitialDirectory(folderPath)
|
|
||||||
// .setShowBackupFiles(true)
|
|
||||||
// .setInteractionListener(file -> {
|
|
||||||
// isEncrypted = ExportImportUtils.isEncrypted(file);
|
|
||||||
// if (isEncrypted) {
|
|
||||||
// binding.passwordGroup.setVisibility(View.VISIBLE);
|
|
||||||
// binding.passwordGroup.post(() -> {
|
|
||||||
// binding.etPassword.requestFocus();
|
|
||||||
// binding.etPassword.post(() -> {
|
|
||||||
// final InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
|
|
||||||
// if (imm == null) return;
|
|
||||||
// imm.showSoftInput(binding.etPassword, InputMethodManager.SHOW_IMPLICIT);
|
|
||||||
// });
|
|
||||||
// binding.btnRestore.setEnabled(!TextUtils.isEmpty(binding.etPassword.getText()));
|
|
||||||
// });
|
|
||||||
// } else {
|
|
||||||
// binding.passwordGroup.setVisibility(View.GONE);
|
|
||||||
// binding.btnRestore.setEnabled(true);
|
|
||||||
// }
|
|
||||||
// this.file = file;
|
|
||||||
// binding.filePath.setText(file.getAbsolutePath());
|
|
||||||
// });
|
|
||||||
// directoryChooser.setEnterTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
|
|
||||||
// directoryChooser.setExitTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
|
|
||||||
// directoryChooser.setOnCancelListener(this::dismiss);
|
|
||||||
// directoryChooser.show(getChildFragmentManager(), "directory_chooser");
|
|
||||||
// }
|
|
||||||
|
|
||||||
public interface OnResultListener {
|
public interface OnResultListener {
|
||||||
void onResult(boolean result);
|
void onResult(boolean result);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -34,7 +34,6 @@ import static awais.instagrabber.utils.Utils.settingsHelper;
|
|||||||
|
|
||||||
public class DownloadsPreferencesFragment extends BasePreferencesFragment {
|
public class DownloadsPreferencesFragment extends BasePreferencesFragment {
|
||||||
private static final String TAG = DownloadsPreferencesFragment.class.getSimpleName();
|
private static final String TAG = DownloadsPreferencesFragment.class.getSimpleName();
|
||||||
// private SaveToCustomFolderPreference.ResultCallback resultCallback;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
void setupPreferenceScreen(final PreferenceScreen screen) {
|
void setupPreferenceScreen(final PreferenceScreen screen) {
|
||||||
@ -74,28 +73,6 @@ public class DownloadsPreferencesFragment extends BasePreferencesFragment {
|
|||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
return preference;
|
return preference;
|
||||||
// return new SaveToCustomFolderPreference(context, checked -> {
|
|
||||||
// try {
|
|
||||||
// DownloadUtils.init(context);
|
|
||||||
// } catch (DownloadUtils.ReselectDocumentTreeException e) {
|
|
||||||
// if (!checked) return;
|
|
||||||
// startDocumentSelector(e.getInitialUri());
|
|
||||||
// } catch (Exception e) {
|
|
||||||
// Log.e(TAG, "getSaveToCustomFolderPreference: ", e);
|
|
||||||
// }
|
|
||||||
// }, (resultCallback) -> {
|
|
||||||
// // Choose a directory using the system's file picker.
|
|
||||||
// startDocumentSelector(null);
|
|
||||||
// this.resultCallback = resultCallback;
|
|
||||||
//
|
|
||||||
// // new DirectoryChooser()
|
|
||||||
// // .setInitialDirectory(settingsHelper.getString(FOLDER_PATH))
|
|
||||||
// // .setInteractionListener(file -> {
|
|
||||||
// // settingsHelper.putString(FOLDER_PATH, file.getAbsolutePath());
|
|
||||||
// // resultCallback.onResult(file.getAbsolutePath());
|
|
||||||
// // })
|
|
||||||
// // .show(getParentFragmentManager(), null);
|
|
||||||
// });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void openDirectoryChooser(final Uri initialUri) {
|
private void openDirectoryChooser(final Uri initialUri) {
|
||||||
@ -145,75 +122,4 @@ public class DownloadsPreferencesFragment extends BasePreferencesFragment {
|
|||||||
preference.setIconSpaceReserved(false);
|
preference.setIconSpaceReserved(false);
|
||||||
return preference;
|
return preference;
|
||||||
}
|
}
|
||||||
|
|
||||||
// public static class SaveToCustomFolderPreference extends Preference {
|
|
||||||
// private AppCompatTextView customPathTextView;
|
|
||||||
// private final OnSaveToChangeListener onSaveToChangeListener;
|
|
||||||
// private final OnSelectFolderButtonClickListener onSelectFolderButtonClickListener;
|
|
||||||
// private final String key;
|
|
||||||
//
|
|
||||||
// public SaveToCustomFolderPreference(final Context context,
|
|
||||||
// final OnSaveToChangeListener onSaveToChangeListener,
|
|
||||||
// final OnSelectFolderButtonClickListener onSelectFolderButtonClickListener) {
|
|
||||||
// super(context);
|
|
||||||
// this.onSaveToChangeListener = onSaveToChangeListener;
|
|
||||||
// this.onSelectFolderButtonClickListener = onSelectFolderButtonClickListener;
|
|
||||||
// key = FOLDER_SAVE_TO;
|
|
||||||
// setLayoutResource(R.layout.pref_custom_folder);
|
|
||||||
// setKey(key);
|
|
||||||
// setTitle(R.string.save_to_folder);
|
|
||||||
// setIconSpaceReserved(false);
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// public void onBindViewHolder(final PreferenceViewHolder holder) {
|
|
||||||
// super.onBindViewHolder(holder);
|
|
||||||
// final SwitchMaterial cbSaveTo = (SwitchMaterial) holder.findViewById(R.id.cbSaveTo);
|
|
||||||
// final View buttonContainer = holder.findViewById(R.id.button_container);
|
|
||||||
// customPathTextView = (AppCompatTextView) holder.findViewById(R.id.custom_path);
|
|
||||||
// cbSaveTo.setOnCheckedChangeListener((buttonView, isChecked) -> {
|
|
||||||
// settingsHelper.putBoolean(FOLDER_SAVE_TO, isChecked);
|
|
||||||
// buttonContainer.setVisibility(isChecked ? View.VISIBLE : View.GONE);
|
|
||||||
// final Context context = getContext();
|
|
||||||
// String customPath = settingsHelper.getString(FOLDER_PATH);
|
|
||||||
// if (!TextUtils.isEmpty(customPath) && customPath.startsWith("content") && context != null) {
|
|
||||||
// final Uri uri = Uri.parse(customPath);
|
|
||||||
// final DocumentFile documentFile = DocumentFile.fromSingleUri(context, uri);
|
|
||||||
// try {
|
|
||||||
// customPath = Utils.getDocumentFileRealPath(context, documentFile).getAbsolutePath();
|
|
||||||
// } catch (Exception e) {
|
|
||||||
// Log.e(TAG, "onBindViewHolder: ", e);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// customPathTextView.setText(customPath);
|
|
||||||
// if (onSaveToChangeListener != null) {
|
|
||||||
// onSaveToChangeListener.onChange(isChecked);
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// final boolean savedToEnabled = settingsHelper.getBoolean(key);
|
|
||||||
// holder.itemView.setOnClickListener(v -> cbSaveTo.toggle());
|
|
||||||
// cbSaveTo.setChecked(savedToEnabled);
|
|
||||||
// buttonContainer.setVisibility(savedToEnabled ? View.VISIBLE : View.GONE);
|
|
||||||
// final AppCompatButton btnSaveTo = (AppCompatButton) holder.findViewById(R.id.btnSaveTo);
|
|
||||||
// btnSaveTo.setOnClickListener(v -> {
|
|
||||||
// if (onSelectFolderButtonClickListener == null) return;
|
|
||||||
// onSelectFolderButtonClickListener.onClick(result -> {
|
|
||||||
// if (TextUtils.isEmpty(result)) return;
|
|
||||||
// customPathTextView.setText(result);
|
|
||||||
// });
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public interface ResultCallback {
|
|
||||||
// void onResult(String result);
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public interface OnSelectFolderButtonClickListener {
|
|
||||||
// void onClick(ResultCallback resultCallback);
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public interface OnSaveToChangeListener {
|
|
||||||
// void onChange(boolean checked);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,285 +0,0 @@
|
|||||||
package awais.instagrabber.utils;
|
|
||||||
|
|
||||||
import android.app.Activity;
|
|
||||||
import android.app.Dialog;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.graphics.drawable.Drawable;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.os.Environment;
|
|
||||||
import android.os.FileObserver;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.annotation.Nullable;
|
|
||||||
import androidx.fragment.app.DialogFragment;
|
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
import androidx.lifecycle.ViewModelProvider;
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import awais.instagrabber.R;
|
|
||||||
import awais.instagrabber.adapters.DirectoryFilesAdapter;
|
|
||||||
import awais.instagrabber.databinding.LayoutDirectoryChooserBinding;
|
|
||||||
import awais.instagrabber.viewmodels.FileListViewModel;
|
|
||||||
|
|
||||||
public final class DirectoryChooser extends DialogFragment {
|
|
||||||
private static final String TAG = "DirectoryChooser";
|
|
||||||
|
|
||||||
public static final String KEY_CURRENT_DIRECTORY = "CURRENT_DIRECTORY";
|
|
||||||
private static final File sdcardPathFile = Environment.getExternalStorageDirectory();
|
|
||||||
private static final String sdcardPath = sdcardPathFile.getPath();
|
|
||||||
|
|
||||||
private Context context;
|
|
||||||
private LayoutDirectoryChooserBinding binding;
|
|
||||||
private FileObserver fileObserver;
|
|
||||||
private File selectedDir;
|
|
||||||
private String initialDirectory;
|
|
||||||
private OnFragmentInteractionListener interactionListener;
|
|
||||||
private boolean showBackupFiles = false;
|
|
||||||
private View.OnClickListener navigationOnClickListener;
|
|
||||||
private FileListViewModel fileListViewModel;
|
|
||||||
private OnCancelListener onCancelListener;
|
|
||||||
|
|
||||||
public DirectoryChooser() {
|
|
||||||
super();
|
|
||||||
}
|
|
||||||
|
|
||||||
public DirectoryChooser setInitialDirectory(final String initialDirectory) {
|
|
||||||
if (!TextUtils.isEmpty(initialDirectory))
|
|
||||||
this.initialDirectory = initialDirectory;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public DirectoryChooser setShowBackupFiles(final boolean showBackupFiles) {
|
|
||||||
this.showBackupFiles = showBackupFiles;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onAttach(@NonNull final Context context) {
|
|
||||||
super.onAttach(context);
|
|
||||||
|
|
||||||
this.context = context;
|
|
||||||
|
|
||||||
if (this.context instanceof OnFragmentInteractionListener)
|
|
||||||
interactionListener = (OnFragmentInteractionListener) this.context;
|
|
||||||
else {
|
|
||||||
final Fragment owner = getTargetFragment();
|
|
||||||
if (owner instanceof OnFragmentInteractionListener)
|
|
||||||
interactionListener = (OnFragmentInteractionListener) owner;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@NonNull
|
|
||||||
@Override
|
|
||||||
public View onCreateView(@NonNull final LayoutInflater inflater, @Nullable final ViewGroup container, @Nullable final Bundle savedInstanceState) {
|
|
||||||
binding = LayoutDirectoryChooserBinding.inflate(inflater, container, false);
|
|
||||||
init(container);
|
|
||||||
return binding.getRoot();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void init(final ViewGroup container) {
|
|
||||||
Context context = this.context;
|
|
||||||
if (context == null) context = getContext();
|
|
||||||
if (context == null) context = getActivity();
|
|
||||||
if (context == null) return;
|
|
||||||
// if (ContextCompat.checkSelfPermission(context, DownloadUtils.PERMS[0]) != PackageManager.PERMISSION_GRANTED) {
|
|
||||||
// final String text = "Storage permissions denied!";
|
|
||||||
// if (container == null) {
|
|
||||||
// Toast.makeText(context, text, Toast.LENGTH_LONG).show();
|
|
||||||
// } else {
|
|
||||||
// Snackbar.make(container, text, BaseTransientBottomBar.LENGTH_LONG).show();
|
|
||||||
// }
|
|
||||||
// dismiss();
|
|
||||||
// }
|
|
||||||
final View.OnClickListener clickListener = v -> {
|
|
||||||
if (v == binding.btnConfirm) {
|
|
||||||
if (interactionListener != null && isValidFile(selectedDir))
|
|
||||||
interactionListener.onSelectDirectory(selectedDir);
|
|
||||||
dismiss();
|
|
||||||
} else if (v == binding.btnCancel) {
|
|
||||||
if (onCancelListener != null) {
|
|
||||||
onCancelListener.onCancel();
|
|
||||||
}
|
|
||||||
dismiss();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
navigationOnClickListener = v -> {
|
|
||||||
final File parent;
|
|
||||||
if (selectedDir != null && (parent = selectedDir.getParentFile()) != null) {
|
|
||||||
changeDirectory(parent);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
binding.toolbar.setNavigationOnClickListener(navigationOnClickListener);
|
|
||||||
binding.toolbar.setSubtitle(showBackupFiles ? R.string.select_backup_file : R.string.select_folder);
|
|
||||||
binding.btnCancel.setOnClickListener(clickListener);
|
|
||||||
// no need to show confirm for file picker
|
|
||||||
binding.btnConfirm.setVisibility(showBackupFiles ? View.GONE : View.VISIBLE);
|
|
||||||
if (!showBackupFiles) {
|
|
||||||
binding.btnConfirm.setOnClickListener(clickListener);
|
|
||||||
}
|
|
||||||
fileListViewModel = new ViewModelProvider(this).get(FileListViewModel.class);
|
|
||||||
final DirectoryFilesAdapter listDirectoriesAdapter = new DirectoryFilesAdapter(file -> {
|
|
||||||
if (file.isDirectory()) {
|
|
||||||
changeDirectory(file);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (showBackupFiles && file.isFile()) {
|
|
||||||
if (interactionListener != null && file.canRead()) {
|
|
||||||
interactionListener.onSelectDirectory(file);
|
|
||||||
}
|
|
||||||
dismiss();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
fileListViewModel.getList().observe(this, listDirectoriesAdapter::submitList);
|
|
||||||
binding.directoryList.setLayoutManager(new LinearLayoutManager(context));
|
|
||||||
binding.directoryList.setAdapter(listDirectoriesAdapter);
|
|
||||||
final File initDir = new File(initialDirectory);
|
|
||||||
final File initialDir = !TextUtils.isEmpty(initialDirectory) && isValidFile(initDir) ? initDir : Environment.getExternalStorageDirectory();
|
|
||||||
changeDirectory(initialDir);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(@Nullable final Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
|
|
||||||
if (TextUtils.isEmpty(initialDirectory)) {
|
|
||||||
initialDirectory = new File(sdcardPath, "Download").getAbsolutePath();
|
|
||||||
if (savedInstanceState != null) {
|
|
||||||
final String savedDir = savedInstanceState.getString(KEY_CURRENT_DIRECTORY);
|
|
||||||
if (!TextUtils.isEmpty(savedDir)) initialDirectory = savedDir;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
setStyle(DialogFragment.STYLE_NO_TITLE, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
@NonNull
|
|
||||||
@Override
|
|
||||||
public Dialog onCreateDialog(final Bundle savedInstanceState) {
|
|
||||||
return new Dialog(context, R.attr.alertDialogTheme) {
|
|
||||||
@Override
|
|
||||||
public void onBackPressed() {
|
|
||||||
if (selectedDir != null) {
|
|
||||||
final String absolutePath = selectedDir.getAbsolutePath();
|
|
||||||
if (absolutePath.equals(sdcardPath) || absolutePath.equals(sdcardPathFile.getAbsolutePath())) {
|
|
||||||
if (onCancelListener != null) {
|
|
||||||
onCancelListener.onCancel();
|
|
||||||
}
|
|
||||||
dismiss();
|
|
||||||
} else {
|
|
||||||
changeDirectory(selectedDir.getParentFile());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onSaveInstanceState(@NonNull final Bundle outState) {
|
|
||||||
super.onSaveInstanceState(outState);
|
|
||||||
if (selectedDir != null) outState.putString(KEY_CURRENT_DIRECTORY, selectedDir.getAbsolutePath());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume() {
|
|
||||||
super.onResume();
|
|
||||||
if (fileObserver != null) fileObserver.startWatching();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onPause() {
|
|
||||||
super.onPause();
|
|
||||||
if (fileObserver != null) fileObserver.stopWatching();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDetach() {
|
|
||||||
super.onDetach();
|
|
||||||
interactionListener = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void changeDirectory(final File dir) {
|
|
||||||
if (dir != null && dir.isDirectory()) {
|
|
||||||
final String path = dir.getAbsolutePath();
|
|
||||||
binding.toolbar.setTitle(path);
|
|
||||||
final File[] contents = dir.listFiles();
|
|
||||||
if (contents != null) {
|
|
||||||
final List<File> fileNames = new ArrayList<>();
|
|
||||||
for (final File f : contents) {
|
|
||||||
final String name = f.getName();
|
|
||||||
final String nameLowerCase = name.toLowerCase();
|
|
||||||
final boolean isBackupFile = nameLowerCase.endsWith(".zaai") || nameLowerCase.endsWith(".backup");
|
|
||||||
if (f.isDirectory() || (showBackupFiles && f.isFile() && isBackupFile))
|
|
||||||
fileNames.add(f);
|
|
||||||
}
|
|
||||||
Collections.sort(fileNames, (o1, o2) -> {
|
|
||||||
if ((o1.isDirectory() && o2.isDirectory())
|
|
||||||
|| (o1.isFile() && o2.isFile())) {
|
|
||||||
return o1.getName().compareToIgnoreCase(o2.getName());
|
|
||||||
}
|
|
||||||
if (o1.isDirectory()) return -1;
|
|
||||||
if (o2.isDirectory()) return 1;
|
|
||||||
return 0;
|
|
||||||
});
|
|
||||||
fileListViewModel.getList().postValue(fileNames);
|
|
||||||
selectedDir = dir;
|
|
||||||
fileObserver = new FileObserver(path, FileObserver.CREATE | FileObserver.DELETE | FileObserver.MOVED_FROM | FileObserver.MOVED_TO) {
|
|
||||||
private final Runnable currentDirRefresher = () -> changeDirectory(selectedDir);
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onEvent(final int event, final String path) {
|
|
||||||
if (context instanceof Activity) ((Activity) context).runOnUiThread(currentDirRefresher);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
fileObserver.startWatching();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
refreshButtonState();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void refreshButtonState() {
|
|
||||||
if (selectedDir != null) {
|
|
||||||
final String path = selectedDir.getAbsolutePath();
|
|
||||||
toggleUpButton(!path.equals(sdcardPathFile.getAbsolutePath()) && selectedDir != sdcardPathFile);
|
|
||||||
binding.btnConfirm.setEnabled(isValidFile(selectedDir));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void toggleUpButton(final boolean enable) {
|
|
||||||
binding.toolbar.setNavigationOnClickListener(enable ? navigationOnClickListener : null);
|
|
||||||
final Drawable navigationIcon = binding.toolbar.getNavigationIcon();
|
|
||||||
if (navigationIcon == null) return;
|
|
||||||
navigationIcon.setAlpha(enable ? 255 : (int) (255 * 0.617));
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isValidFile(final File file) {
|
|
||||||
return file != null && file.isDirectory() && file.canRead();
|
|
||||||
}
|
|
||||||
|
|
||||||
public DirectoryChooser setInteractionListener(final OnFragmentInteractionListener interactionListener) {
|
|
||||||
this.interactionListener = interactionListener;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setOnCancelListener(final OnCancelListener onCancelListener) {
|
|
||||||
if (onCancelListener != null) {
|
|
||||||
this.onCancelListener = onCancelListener;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public interface OnCancelListener {
|
|
||||||
void onCancel();
|
|
||||||
}
|
|
||||||
|
|
||||||
public interface OnFragmentInteractionListener {
|
|
||||||
void onSelectDirectory(final File file);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,90 +0,0 @@
|
|||||||
package awais.instagrabber.utils;
|
|
||||||
|
|
||||||
import android.os.Environment;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
|
|
||||||
public class DirectoryUtils {
|
|
||||||
private static final Pattern DIR_SEPORATOR = Pattern.compile("/");
|
|
||||||
|
|
||||||
/**
|
|
||||||
* From: https://stackoverflow.com/a/18871043/1436766
|
|
||||||
* <p>
|
|
||||||
* Returns all available SD-Cards in the system (include emulated)
|
|
||||||
* <p>
|
|
||||||
* Warning: Hack! Based on Android source code of version 4.3 (API 18)
|
|
||||||
* Because there is no standard way to get it.
|
|
||||||
* TODO: Test on future Android versions 4.4+
|
|
||||||
*
|
|
||||||
* @return paths to all available SD-Cards in the system (include emulated)
|
|
||||||
*/
|
|
||||||
public static Set<String> getStorageDirectories() {
|
|
||||||
// Final set of paths
|
|
||||||
final Set<String> rv = new HashSet<>();
|
|
||||||
// Primary physical SD-CARD (not emulated)
|
|
||||||
final String rawExternalStorage = System.getenv("EXTERNAL_STORAGE");
|
|
||||||
// All Secondary SD-CARDs (all exclude primary) separated by ":"
|
|
||||||
final String rawSecondaryStoragesStr = System.getenv("SECONDARY_STORAGE");
|
|
||||||
// Primary emulated SD-CARD
|
|
||||||
final String rawEmulatedStorageTarget = System.getenv("EMULATED_STORAGE_TARGET");
|
|
||||||
if (TextUtils.isEmpty(rawEmulatedStorageTarget)) {
|
|
||||||
// Device has physical external storage; use plain paths.
|
|
||||||
if (TextUtils.isEmpty(rawExternalStorage)) {
|
|
||||||
// EXTERNAL_STORAGE undefined; falling back to default.
|
|
||||||
rv.add("/storage/sdcard0");
|
|
||||||
} else {
|
|
||||||
rv.add(rawExternalStorage);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Device has emulated storage; external storage paths should have
|
|
||||||
// userId burned into them.
|
|
||||||
final String rawUserId;
|
|
||||||
final String path = Environment.getExternalStorageDirectory().getAbsolutePath();
|
|
||||||
final String[] folders = DIR_SEPORATOR.split(path);
|
|
||||||
final String lastFolder = folders[folders.length - 1];
|
|
||||||
boolean isDigit = false;
|
|
||||||
try {
|
|
||||||
Integer.valueOf(lastFolder);
|
|
||||||
isDigit = true;
|
|
||||||
} catch (NumberFormatException ignored) {
|
|
||||||
}
|
|
||||||
rawUserId = isDigit ? lastFolder : "";
|
|
||||||
// /storage/emulated/0[1,2,...]
|
|
||||||
if (TextUtils.isEmpty(rawUserId)) {
|
|
||||||
rv.add(rawEmulatedStorageTarget);
|
|
||||||
} else {
|
|
||||||
rv.add(rawEmulatedStorageTarget + File.separator + rawUserId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Add all secondary storages
|
|
||||||
if (!TextUtils.isEmpty(rawSecondaryStoragesStr)) {
|
|
||||||
// All Secondary SD-CARDs splited into array
|
|
||||||
final String[] rawSecondaryStorages = rawSecondaryStoragesStr.split(File.pathSeparator);
|
|
||||||
Collections.addAll(rv, rawSecondaryStorages);
|
|
||||||
}
|
|
||||||
return rv;
|
|
||||||
}
|
|
||||||
|
|
||||||
// public static File getOutputMediaDirectory(final Context context, final String... dirs) {
|
|
||||||
// if (context == null) return null;
|
|
||||||
// final File[] externalMediaDirs = context.getExternalMediaDirs();
|
|
||||||
// if (externalMediaDirs == null || externalMediaDirs.length == 0) return context.getFilesDir();
|
|
||||||
// final File externalMediaDir = externalMediaDirs[0];
|
|
||||||
// File subDir = new File(externalMediaDir, context.getString(R.string.app_name));
|
|
||||||
// if (dirs != null) {
|
|
||||||
// for (final String dir : dirs) {
|
|
||||||
// subDir = new File(subDir, dir);
|
|
||||||
// //noinspection ResultOfMethodCallIgnored
|
|
||||||
// subDir.mkdirs();
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// if (!subDir.exists()) {
|
|
||||||
// return context.getFilesDir();
|
|
||||||
// }
|
|
||||||
// return subDir;
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user