Merge pull request #7452 from litetex/show-alert-when-file-manager-not-found
Show an alert-dialog when no appropriate file-manager was found
This commit is contained in:
commit
b21d231e3a
|
@ -53,6 +53,7 @@ import org.schabi.newpipe.extractor.stream.StreamInfo;
|
||||||
import org.schabi.newpipe.extractor.stream.SubtitlesStream;
|
import org.schabi.newpipe.extractor.stream.SubtitlesStream;
|
||||||
import org.schabi.newpipe.extractor.stream.VideoStream;
|
import org.schabi.newpipe.extractor.stream.VideoStream;
|
||||||
import org.schabi.newpipe.settings.NewPipeSettings;
|
import org.schabi.newpipe.settings.NewPipeSettings;
|
||||||
|
import org.schabi.newpipe.streams.io.NoFileManagerSafeGuard;
|
||||||
import org.schabi.newpipe.streams.io.StoredDirectoryHelper;
|
import org.schabi.newpipe.streams.io.StoredDirectoryHelper;
|
||||||
import org.schabi.newpipe.streams.io.StoredFileHelper;
|
import org.schabi.newpipe.streams.io.StoredFileHelper;
|
||||||
import org.schabi.newpipe.util.FilePickerActivityHelper;
|
import org.schabi.newpipe.util.FilePickerActivityHelper;
|
||||||
|
@ -687,7 +688,12 @@ public class DownloadDialog extends DialogFragment
|
||||||
}
|
}
|
||||||
|
|
||||||
private void launchDirectoryPicker(final ActivityResultLauncher<Intent> launcher) {
|
private void launchDirectoryPicker(final ActivityResultLauncher<Intent> launcher) {
|
||||||
launcher.launch(StoredDirectoryHelper.getPicker(context));
|
NoFileManagerSafeGuard.launchSafe(
|
||||||
|
launcher,
|
||||||
|
StoredDirectoryHelper.getPicker(context),
|
||||||
|
TAG,
|
||||||
|
context
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void prepareSelectedDownload() {
|
private void prepareSelectedDownload() {
|
||||||
|
@ -766,8 +772,12 @@ public class DownloadDialog extends DialogFragment
|
||||||
initialPath = Uri.parse(initialSavePath.getAbsolutePath());
|
initialPath = Uri.parse(initialSavePath.getAbsolutePath());
|
||||||
}
|
}
|
||||||
|
|
||||||
requestDownloadSaveAsLauncher.launch(StoredFileHelper.getNewPicker(context,
|
NoFileManagerSafeGuard.launchSafe(
|
||||||
filenameTmp, mimeTmp, initialPath));
|
requestDownloadSaveAsLauncher,
|
||||||
|
StoredFileHelper.getNewPicker(context, filenameTmp, mimeTmp, initialPath),
|
||||||
|
TAG,
|
||||||
|
context
|
||||||
|
);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,6 +55,7 @@ import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService
|
||||||
import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_MODE
|
import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_MODE
|
||||||
import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_VALUE
|
import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_VALUE
|
||||||
import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.PREVIOUS_EXPORT_MODE
|
import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.PREVIOUS_EXPORT_MODE
|
||||||
|
import org.schabi.newpipe.streams.io.NoFileManagerSafeGuard
|
||||||
import org.schabi.newpipe.streams.io.StoredFileHelper
|
import org.schabi.newpipe.streams.io.StoredFileHelper
|
||||||
import org.schabi.newpipe.util.NavigationHelper
|
import org.schabi.newpipe.util.NavigationHelper
|
||||||
import org.schabi.newpipe.util.OnClickGesture
|
import org.schabi.newpipe.util.OnClickGesture
|
||||||
|
@ -179,15 +180,23 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun onImportPreviousSelected() {
|
private fun onImportPreviousSelected() {
|
||||||
requestImportLauncher.launch(StoredFileHelper.getPicker(activity, JSON_MIME_TYPE))
|
NoFileManagerSafeGuard.launchSafe(
|
||||||
|
requestImportLauncher,
|
||||||
|
StoredFileHelper.getPicker(activity, JSON_MIME_TYPE),
|
||||||
|
TAG,
|
||||||
|
requireContext()
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun onExportSelected() {
|
private fun onExportSelected() {
|
||||||
val date = SimpleDateFormat("yyyyMMddHHmm", Locale.ENGLISH).format(Date())
|
val date = SimpleDateFormat("yyyyMMddHHmm", Locale.ENGLISH).format(Date())
|
||||||
val exportName = "newpipe_subscriptions_$date.json"
|
val exportName = "newpipe_subscriptions_$date.json"
|
||||||
|
|
||||||
requestExportLauncher.launch(
|
NoFileManagerSafeGuard.launchSafe(
|
||||||
StoredFileHelper.getNewPicker(activity, exportName, JSON_MIME_TYPE, null)
|
requestExportLauncher,
|
||||||
|
StoredFileHelper.getNewPicker(activity, exportName, JSON_MIME_TYPE, null),
|
||||||
|
TAG,
|
||||||
|
requireContext()
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -30,6 +30,7 @@ import org.schabi.newpipe.extractor.NewPipe;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
||||||
import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
|
import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
|
||||||
import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService;
|
import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService;
|
||||||
|
import org.schabi.newpipe.streams.io.NoFileManagerSafeGuard;
|
||||||
import org.schabi.newpipe.streams.io.StoredFileHelper;
|
import org.schabi.newpipe.streams.io.StoredFileHelper;
|
||||||
import org.schabi.newpipe.util.Constants;
|
import org.schabi.newpipe.util.Constants;
|
||||||
import org.schabi.newpipe.util.ServiceHelper;
|
import org.schabi.newpipe.util.ServiceHelper;
|
||||||
|
@ -174,8 +175,14 @@ public class SubscriptionsImportFragment extends BaseFragment {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onImportFile() {
|
public void onImportFile() {
|
||||||
// leave */* mime type to support all services with different mime types and file extensions
|
NoFileManagerSafeGuard.launchSafe(
|
||||||
requestImportFileLauncher.launch(StoredFileHelper.getPicker(activity, "*/*"));
|
requestImportFileLauncher,
|
||||||
|
// leave */* mime type to support all services
|
||||||
|
// with different mime types and file extensions
|
||||||
|
StoredFileHelper.getPicker(activity, "*/*"),
|
||||||
|
TAG,
|
||||||
|
getContext()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void requestImportFileResult(final ActivityResult result) {
|
private void requestImportFileResult(final ActivityResult result) {
|
||||||
|
|
|
@ -25,6 +25,7 @@ import org.schabi.newpipe.error.ReCaptchaActivity;
|
||||||
import org.schabi.newpipe.extractor.NewPipe;
|
import org.schabi.newpipe.extractor.NewPipe;
|
||||||
import org.schabi.newpipe.extractor.localization.ContentCountry;
|
import org.schabi.newpipe.extractor.localization.ContentCountry;
|
||||||
import org.schabi.newpipe.extractor.localization.Localization;
|
import org.schabi.newpipe.extractor.localization.Localization;
|
||||||
|
import org.schabi.newpipe.streams.io.NoFileManagerSafeGuard;
|
||||||
import org.schabi.newpipe.streams.io.StoredFileHelper;
|
import org.schabi.newpipe.streams.io.StoredFileHelper;
|
||||||
import org.schabi.newpipe.util.NavigationHelper;
|
import org.schabi.newpipe.util.NavigationHelper;
|
||||||
import org.schabi.newpipe.util.PicassoHelper;
|
import org.schabi.newpipe.util.PicassoHelper;
|
||||||
|
@ -73,19 +74,28 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
|
||||||
|
|
||||||
final Preference importDataPreference = requirePreference(R.string.import_data);
|
final Preference importDataPreference = requirePreference(R.string.import_data);
|
||||||
importDataPreference.setOnPreferenceClickListener((Preference p) -> {
|
importDataPreference.setOnPreferenceClickListener((Preference p) -> {
|
||||||
requestImportPathLauncher.launch(
|
NoFileManagerSafeGuard.launchSafe(
|
||||||
|
requestImportPathLauncher,
|
||||||
StoredFileHelper.getPicker(requireContext(),
|
StoredFileHelper.getPicker(requireContext(),
|
||||||
ZIP_MIME_TYPE, getImportExportDataUri()));
|
ZIP_MIME_TYPE, getImportExportDataUri()),
|
||||||
|
TAG,
|
||||||
|
getContext()
|
||||||
|
);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
|
|
||||||
final Preference exportDataPreference = requirePreference(R.string.export_data);
|
final Preference exportDataPreference = requirePreference(R.string.export_data);
|
||||||
exportDataPreference.setOnPreferenceClickListener((final Preference p) -> {
|
exportDataPreference.setOnPreferenceClickListener((final Preference p) -> {
|
||||||
|
NoFileManagerSafeGuard.launchSafe(
|
||||||
requestExportPathLauncher.launch(
|
requestExportPathLauncher,
|
||||||
StoredFileHelper.getNewPicker(requireContext(),
|
StoredFileHelper.getNewPicker(requireContext(),
|
||||||
"NewPipeData-" + exportDateFormat.format(new Date()) + ".zip",
|
"NewPipeData-" + exportDateFormat.format(new Date()) + ".zip",
|
||||||
ZIP_MIME_TYPE, getImportExportDataUri()));
|
ZIP_MIME_TYPE, getImportExportDataUri()),
|
||||||
|
TAG,
|
||||||
|
getContext()
|
||||||
|
);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@ import androidx.preference.SwitchPreferenceCompat;
|
||||||
import com.nononsenseapps.filepicker.Utils;
|
import com.nononsenseapps.filepicker.Utils;
|
||||||
|
|
||||||
import org.schabi.newpipe.R;
|
import org.schabi.newpipe.R;
|
||||||
|
import org.schabi.newpipe.streams.io.NoFileManagerSafeGuard;
|
||||||
import org.schabi.newpipe.streams.io.StoredDirectoryHelper;
|
import org.schabi.newpipe.streams.io.StoredDirectoryHelper;
|
||||||
import org.schabi.newpipe.util.FilePickerActivityHelper;
|
import org.schabi.newpipe.util.FilePickerActivityHelper;
|
||||||
|
|
||||||
|
@ -214,7 +215,12 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void launchDirectoryPicker(final ActivityResultLauncher<Intent> launcher) {
|
private void launchDirectoryPicker(final ActivityResultLauncher<Intent> launcher) {
|
||||||
launcher.launch(StoredDirectoryHelper.getPicker(ctx));
|
NoFileManagerSafeGuard.launchSafe(
|
||||||
|
launcher,
|
||||||
|
StoredDirectoryHelper.getPicker(ctx),
|
||||||
|
TAG,
|
||||||
|
ctx
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void requestDownloadVideoPathResult(final ActivityResult result) {
|
private void requestDownloadVideoPathResult(final ActivityResult result) {
|
||||||
|
|
|
@ -0,0 +1,75 @@
|
||||||
|
package org.schabi.newpipe.streams.io;
|
||||||
|
|
||||||
|
import android.content.ActivityNotFoundException;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.Build;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import androidx.activity.result.ActivityResultLauncher;
|
||||||
|
import androidx.appcompat.app.AlertDialog;
|
||||||
|
|
||||||
|
import org.schabi.newpipe.R;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Helper for when no file-manager/activity was found.
|
||||||
|
*/
|
||||||
|
public final class NoFileManagerSafeGuard {
|
||||||
|
private NoFileManagerSafeGuard() {
|
||||||
|
// No impl
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shows an alert dialog when no file-manager is found.
|
||||||
|
* @param context Context
|
||||||
|
*/
|
||||||
|
private static void showActivityNotFoundAlert(final Context context) {
|
||||||
|
if (context == null) {
|
||||||
|
throw new IllegalArgumentException(
|
||||||
|
"Unable to open no file manager alert dialog: Context is null");
|
||||||
|
}
|
||||||
|
|
||||||
|
final String message;
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
||||||
|
// Android 10+ only allows SAF
|
||||||
|
message = context.getString(R.string.no_appropriate_file_manager_message_android_10);
|
||||||
|
} else {
|
||||||
|
message = context.getString(
|
||||||
|
R.string.no_appropriate_file_manager_message,
|
||||||
|
context.getString(R.string.downloads_storage_use_saf_title));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
new AlertDialog.Builder(context)
|
||||||
|
.setTitle(R.string.no_app_to_open_intent)
|
||||||
|
.setMessage(message)
|
||||||
|
.setPositiveButton(R.string.ok, null)
|
||||||
|
.show();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Launches the file manager safely.
|
||||||
|
*
|
||||||
|
* If no file manager is found (which is normally only the case when the user uninstalled
|
||||||
|
* the default file manager or the OS lacks one) an alert dialog shows up, asking the user
|
||||||
|
* to fix the situation.
|
||||||
|
*
|
||||||
|
* @param activityResultLauncher see {@link ActivityResultLauncher#launch(Object)}
|
||||||
|
* @param input see {@link ActivityResultLauncher#launch(Object)}
|
||||||
|
* @param tag Tag used for logging
|
||||||
|
* @param context Context
|
||||||
|
* @param <I> see {@link ActivityResultLauncher#launch(Object)}
|
||||||
|
*/
|
||||||
|
public static <I> void launchSafe(
|
||||||
|
final ActivityResultLauncher<I> activityResultLauncher,
|
||||||
|
final I input,
|
||||||
|
final String tag,
|
||||||
|
final Context context
|
||||||
|
) {
|
||||||
|
try {
|
||||||
|
activityResultLauncher.launch(input);
|
||||||
|
} catch (final ActivityNotFoundException aex) {
|
||||||
|
Log.w(tag, "Unable to launch file/directory picker", aex);
|
||||||
|
NoFileManagerSafeGuard.showActivityNotFoundAlert(context);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -32,6 +32,7 @@ import com.nononsenseapps.filepicker.Utils;
|
||||||
|
|
||||||
import org.schabi.newpipe.R;
|
import org.schabi.newpipe.R;
|
||||||
import org.schabi.newpipe.settings.NewPipeSettings;
|
import org.schabi.newpipe.settings.NewPipeSettings;
|
||||||
|
import org.schabi.newpipe.streams.io.NoFileManagerSafeGuard;
|
||||||
import org.schabi.newpipe.streams.io.StoredFileHelper;
|
import org.schabi.newpipe.streams.io.StoredFileHelper;
|
||||||
import org.schabi.newpipe.util.FilePickerActivityHelper;
|
import org.schabi.newpipe.util.FilePickerActivityHelper;
|
||||||
|
|
||||||
|
@ -46,6 +47,7 @@ import us.shandian.giga.ui.adapter.MissionAdapter;
|
||||||
|
|
||||||
public class MissionsFragment extends Fragment {
|
public class MissionsFragment extends Fragment {
|
||||||
|
|
||||||
|
private static final String TAG = "MissionsFragment";
|
||||||
private static final int SPAN_SIZE = 2;
|
private static final int SPAN_SIZE = 2;
|
||||||
|
|
||||||
private SharedPreferences mPrefs;
|
private SharedPreferences mPrefs;
|
||||||
|
@ -257,9 +259,13 @@ public class MissionsFragment extends Fragment {
|
||||||
initialPath = Uri.parse(initialSavePath.getAbsolutePath());
|
initialPath = Uri.parse(initialSavePath.getAbsolutePath());
|
||||||
}
|
}
|
||||||
|
|
||||||
requestDownloadSaveAsLauncher.launch(
|
NoFileManagerSafeGuard.launchSafe(
|
||||||
|
requestDownloadSaveAsLauncher,
|
||||||
StoredFileHelper.getNewPicker(mContext, mission.storage.getName(),
|
StoredFileHelper.getNewPicker(mContext, mission.storage.getName(),
|
||||||
mission.storage.getType(), initialPath));
|
mission.storage.getType(), initialPath),
|
||||||
|
TAG,
|
||||||
|
mContext
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -681,6 +681,8 @@
|
||||||
<string name="recent">Recent</string>
|
<string name="recent">Recent</string>
|
||||||
<string name="chapters">Chapters</string>
|
<string name="chapters">Chapters</string>
|
||||||
<string name="no_app_to_open_intent">No app on your device can open this</string>
|
<string name="no_app_to_open_intent">No app on your device can open this</string>
|
||||||
|
<string name="no_appropriate_file_manager_message">No appropriate file manager was found for this action.\nPlease install a file manager or try to disable \'%s\' in the download settings.</string>
|
||||||
|
<string name="no_appropriate_file_manager_message_android_10">No appropriate file manager was found for this action.\nPlease install a Storage Access Framework compatible file manager.</string>
|
||||||
<string name="georestricted_content">This content is not available in your country.</string>
|
<string name="georestricted_content">This content is not available in your country.</string>
|
||||||
<string name="soundcloud_go_plus_content">This is a SoundCloud Go+ track, at least in your country, so it cannot be streamed or downloaded by NewPipe.</string>
|
<string name="soundcloud_go_plus_content">This is a SoundCloud Go+ track, at least in your country, so it cannot be streamed or downloaded by NewPipe.</string>
|
||||||
<string name="private_content">This content is private, so it cannot be streamed or downloaded by NewPipe.</string>
|
<string name="private_content">This content is private, so it cannot be streamed or downloaded by NewPipe.</string>
|
||||||
|
|
Loading…
Reference in New Issue