baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

Fix toast shown when falling back to Google Play Store URL and the action of Open with Kodi button in the player

Browse source 
Add a boolean param, showToast, in ShareUtils.openIntentInApp and only show toast "No app on your device can open this" if this boolean is true.
Fix the action of play with Kodi button by applying the fix provided in #5599 (adding the flag Intent.FLAG_ACTIVITY_NEW_TASK to the intent in NavigationHelper.playWithKore method).
Do also some cleanup in viewWithFileProvider and shareFile methods of MissionAdapter class.
This commit is contained in:
TiA4f8R 2021-03-13 12:37:54 +01:00
parent ae9349e36c
commit 9e9d1a04e4
No known key found for this signature in database
GPG key ID: E6D3E7F5949450DD
4 changed files with 47 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java
View file

@ -220,13 +220,10 @@ public class ErrorActivity extends AppCompatActivity {
+ getString(R.string.app_name) + " " + getString(R.string.app_name) + " "
+ BuildConfig.VERSION_NAME) + BuildConfig.VERSION_NAME)
.putExtra(Intent.EXTRA_TEXT, buildJson()); .putExtra(Intent.EXTRA_TEXT, buildJson());
if (i.resolveActivity(getPackageManager()) != null) { ShareUtils.openIntentInApp(context, i, true);
ShareUtils.openIntentInApp(context, i);
}
} else if (action.equals("GITHUB")) { // open the NewPipe issue page on GitHub } else if (action.equals("GITHUB")) { // open the NewPipe issue page on GitHub
ShareUtils.openUrlInBrowser(this, ERROR_GITHUB_ISSUE_URL, false); ShareUtils.openUrlInBrowser(this, ERROR_GITHUB_ISSUE_URL, false);
} }
}) })
.setNegativeButton(R.string.decline, (dialog, which) -> { .setNegativeButton(R.string.decline, (dialog, which) -> {
// do nothing // do nothing

2
app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
View file

@ -252,7 +252,7 @@ public final class NavigationHelper {
public static void resolveActivityOrAskToInstall(final Context context, final Intent intent) { public static void resolveActivityOrAskToInstall(final Context context, final Intent intent) {
if (intent.resolveActivity(context.getPackageManager()) != null) { if (intent.resolveActivity(context.getPackageManager()) != null) {
ShareUtils.openIntentInApp(context, intent); ShareUtils.openIntentInApp(context, intent, false);
} else { } else {
if (context instanceof Activity) { if (context instanceof Activity) {
new AlertDialog.Builder(context) new AlertDialog.Builder(context)

55
app/src/main/java/org/schabi/newpipe/util/ShareUtils.java
View file

@ -25,9 +25,9 @@ public final class ShareUtils {
* second param (a system chooser will be opened if there are multiple markets and no default) * second param (a system chooser will be opened if there are multiple markets and no default)
* and falls back to Google Play Store web URL if no app to handle the market scheme was found. * and falls back to Google Play Store web URL if no app to handle the market scheme was found.
* <p> * <p>
* It uses {@link ShareUtils#openIntentInApp(Context, Intent)} to open market scheme and * It uses {@link ShareUtils#openIntentInApp(Context, Intent, boolean)} to open market scheme
* {@link ShareUtils#openUrlInBrowser(Context, String, boolean)} to open Google Play Store web * and {@link ShareUtils#openUrlInBrowser(Context, String, boolean)} to open Google Play Store
* URL with false for the boolean param. * web URL with false for the boolean param.
* *
* @param context the context to use * @param context the context to use
* @param packageId the package id of the app to be installed * @param packageId the package id of the app to be installed
@ -36,7 +36,7 @@ public final class ShareUtils {
// Try market:// scheme // Try market:// scheme
final boolean marketSchemeResult = openIntentInApp(context, new Intent(Intent.ACTION_VIEW, final boolean marketSchemeResult = openIntentInApp(context, new Intent(Intent.ACTION_VIEW,
Uri.parse("market://details?id=" + packageId)) Uri.parse("market://details?id=" + packageId))
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK), false);
if (!marketSchemeResult) { if (!marketSchemeResult) {
// Fall back to Google Play Store Web URL (F-Droid can handle it) // Fall back to Google Play Store Web URL (F-Droid can handle it)
openUrlInBrowser(context, openUrlInBrowser(context,
@ -48,7 +48,7 @@ public final class ShareUtils {
* Open the url with the system default browser. * Open the url with the system default browser.
* <p> * <p>
* If no browser is set as default, fallbacks to * If no browser is set as default, fallbacks to
* {@link ShareUtils#openAppChooser(Context, Intent, String)} * {@link ShareUtils#openAppChooser(Context, Intent, boolean)}
* *
* @param context the context to use * @param context the context to use
* @param url the url to browse * @param url the url to browse
@ -71,7 +71,7 @@ public final class ShareUtils {
if (defaultPackageName.equals("android")) { if (defaultPackageName.equals("android")) {
// No browser set as default (doesn't work on some devices) // No browser set as default (doesn't work on some devices)
openAppChooser(context, intent, context.getString(R.string.open_with)); openAppChooser(context, intent, true);
} else { } else {
if (defaultPackageName.isEmpty()) { if (defaultPackageName.isEmpty()) {
// No app installed to open a web url // No app installed to open a web url
@ -84,7 +84,7 @@ public final class ShareUtils {
} catch (final ActivityNotFoundException e) { } catch (final ActivityNotFoundException e) {
// Not a browser but an app chooser because of OEMs changes // Not a browser but an app chooser because of OEMs changes
intent.setPackage(null); intent.setPackage(null);
openAppChooser(context, intent, context.getString(R.string.open_with)); openAppChooser(context, intent, true);
} }
} }
} }
@ -96,7 +96,7 @@ public final class ShareUtils {
* Open the url with the system default browser. * Open the url with the system default browser.
* <p> * <p>
* If no browser is set as default, fallbacks to * If no browser is set as default, fallbacks to
* {@link ShareUtils#openAppChooser(Context, Intent, String)} * {@link ShareUtils#openAppChooser(Context, Intent, boolean)}
* <p> * <p>
* This calls {@link ShareUtils#openUrlInBrowser(Context, String, boolean)} with true * This calls {@link ShareUtils#openUrlInBrowser(Context, String, boolean)} with true
* for the boolean parameter * for the boolean parameter
@ -116,22 +116,29 @@ public final class ShareUtils {
* {@link ShareUtils#openUrlInBrowser(Context, String, boolean)} should be used. * {@link ShareUtils#openUrlInBrowser(Context, String, boolean)} should be used.
* <p> * <p>
* If no app is set as default, fallbacks to * If no app is set as default, fallbacks to
* {@link ShareUtils#openAppChooser(Context, Intent, String)} * {@link ShareUtils#openAppChooser(Context, Intent, boolean)}.
* <p>
* *
* @param context the context to use * @param context the context to use
* @param intent the intent to open * @param intent the intent to open
* @param showToast the boolean to set if a toast is displayed to user when no app is installed
* to open the intent (true) or not (false)
* @return true if the intent can be opened or false if it cannot be * @return true if the intent can be opened or false if it cannot be
*/ */
public static boolean openIntentInApp(final Context context, final Intent intent) { public static boolean openIntentInApp(final Context context, final Intent intent,
final boolean showToast) {
final String defaultPackageName = getDefaultAppPackageName(context, intent); final String defaultPackageName = getDefaultAppPackageName(context, intent);
if (defaultPackageName.equals("android")) { if (defaultPackageName.equals("android")) {
// No app set as default (doesn't work on some devices) // No app set as default (doesn't work on some devices)
openAppChooser(context, intent, context.getString(R.string.open_with)); openAppChooser(context, intent, true);
} else { } else {
if (defaultPackageName.isEmpty()) { if (defaultPackageName.isEmpty()) {
// No app installed to open the intent // No app installed to open the intent
Toast.makeText(context, R.string.no_app_to_open_intent, Toast.LENGTH_LONG).show(); if (showToast) {
Toast.makeText(context, R.string.no_app_to_open_intent, Toast.LENGTH_LONG)
.show();
}
return false; return false;
} else { } else {
try { try {
@ -140,7 +147,7 @@ public final class ShareUtils {
} catch (final ActivityNotFoundException e) { } catch (final ActivityNotFoundException e) {
// Not an app to open the intent but an app chooser because of OEMs changes // Not an app to open the intent but an app chooser because of OEMs changes
intent.setPackage(null); intent.setPackage(null);
openAppChooser(context, intent, context.getString(R.string.open_with)); openAppChooser(context, intent, true);
} }
} }
} }
@ -152,18 +159,25 @@ public final class ShareUtils {
* Open the system chooser to launch an intent. * Open the system chooser to launch an intent.
* <p> * <p>
* This method opens an {@link android.content.Intent#ACTION_CHOOSER} of the intent putted * This method opens an {@link android.content.Intent#ACTION_CHOOSER} of the intent putted
* as the viewIntent param. A string for the chooser's title must be passed as the last param. * as the intent param. If the setTitleChooser boolean is true, the string "Open with" will be
* set as the title of the system chooser.
* For Android P and higher, title for {@link android.content.Intent#ACTION_SEND} system
* choosers must be set on this intent, not on the
* {@link android.content.Intent#ACTION_CHOOSER} intent.
* *
* @param context the context to use * @param context the context to use
* @param intent the intent to open * @param intent the intent to open
* @param chooserStringTitle the string of chooser's title * @param setTitleChooser set the title "Open with" to the chooser if true, else not
*/ */
private static void openAppChooser(final Context context, final Intent intent, private static void openAppChooser(final Context context,
final String chooserStringTitle) { final Intent intent,
final boolean setTitleChooser) {
final Intent chooserIntent = new Intent(Intent.ACTION_CHOOSER); final Intent chooserIntent = new Intent(Intent.ACTION_CHOOSER);
chooserIntent.putExtra(Intent.EXTRA_INTENT, intent); chooserIntent.putExtra(Intent.EXTRA_INTENT, intent);
chooserIntent.putExtra(Intent.EXTRA_TITLE, chooserStringTitle);
chooserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); chooserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
if (setTitleChooser) {
chooserIntent.putExtra(Intent.EXTRA_TITLE, context.getString(R.string.open_with));
}
context.startActivity(chooserIntent); context.startActivity(chooserIntent);
} }
@ -201,10 +215,13 @@ public final class ShareUtils {
public static void shareText(final Context context, final String subject, final String url) { public static void shareText(final Context context, final String subject, final String url) {
final Intent shareIntent = new Intent(Intent.ACTION_SEND); final Intent shareIntent = new Intent(Intent.ACTION_SEND);
shareIntent.setType("text/plain"); shareIntent.setType("text/plain");
if (!subject.isEmpty()) {
shareIntent.putExtra(Intent.EXTRA_SUBJECT, subject); shareIntent.putExtra(Intent.EXTRA_SUBJECT, subject);
}
shareIntent.putExtra(Intent.EXTRA_TEXT, url); shareIntent.putExtra(Intent.EXTRA_TEXT, url);
shareIntent.putExtra(Intent.EXTRA_TITLE, context.getString(R.string.share_dialog_title));
openAppChooser(context, shareIntent, context.getString(R.string.share_dialog_title)); openAppChooser(context, shareIntent, false);
} }
/** /**

16
app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
View file

@ -348,10 +348,8 @@ public class MissionAdapter extends Adapter<ViewHolder> implements Handler.Callb
if (BuildConfig.DEBUG) if (BuildConfig.DEBUG)
Log.v(TAG, "Mime: " + mimeType + " package: " + BuildConfig.APPLICATION_ID + ".provider"); Log.v(TAG, "Mime: " + mimeType + " package: " + BuildConfig.APPLICATION_ID + ".provider");
final Uri uri = resolveShareableUri(mission);
Intent intent = new Intent(Intent.ACTION_VIEW); Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setDataAndType(uri, mimeType); intent.setDataAndType(resolveShareableUri(mission), mimeType);
intent.addFlags(FLAG_GRANT_READ_URI_PERMISSION); intent.addFlags(FLAG_GRANT_READ_URI_PERMISSION);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@ -361,10 +359,8 @@ public class MissionAdapter extends Adapter<ViewHolder> implements Handler.Callb
intent.addFlags(FLAG_ACTIVITY_NEW_TASK); intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
} }
//mContext.grantUriPermission(packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
if (intent.resolveActivity(mContext.getPackageManager()) != null) { if (intent.resolveActivity(mContext.getPackageManager()) != null) {
ShareUtils.openIntentInApp(mContext, intent); ShareUtils.openIntentInApp(mContext, intent, false);
} else { } else {
Toast.makeText(mContext, R.string.toast_no_player, Toast.LENGTH_LONG).show(); Toast.makeText(mContext, R.string.toast_no_player, Toast.LENGTH_LONG).show();
} }
@ -377,19 +373,13 @@ public class MissionAdapter extends Adapter<ViewHolder> implements Handler.Callb
shareIntent.setType(resolveMimeType(mission)); shareIntent.setType(resolveMimeType(mission));
shareIntent.putExtra(Intent.EXTRA_STREAM, resolveShareableUri(mission)); shareIntent.putExtra(Intent.EXTRA_STREAM, resolveShareableUri(mission));
shareIntent.addFlags(FLAG_GRANT_READ_URI_PERMISSION); shareIntent.addFlags(FLAG_GRANT_READ_URI_PERMISSION);
final Intent intent = new Intent(Intent.ACTION_CHOOSER); final Intent intent = new Intent(Intent.ACTION_CHOOSER);
intent.putExtra(Intent.EXTRA_INTENT, shareIntent); intent.putExtra(Intent.EXTRA_INTENT, shareIntent);
intent.putExtra(Intent.EXTRA_TITLE, mContext.getString(R.string.share_dialog_title)); intent.putExtra(Intent.EXTRA_TITLE, mContext.getString(R.string.share_dialog_title));
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
try {
intent.setPackage("android");
mContext.startActivity(intent); mContext.startActivity(intent);
} catch (final ActivityNotFoundException e) {
// falling back to OEM chooser if Android's system chooser was removed by the OEM
intent.setPackage(null);
mContext.startActivity(intent);
}
} }
/** /**