Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-03 19:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use symbol for external browser

Browse Source
This commit is contained in:
M66B
2022-06-15 19:17:39 +02:00
parent 3f906668cf
commit 1ad96943af
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
View File

@@ -128,10 +128,10 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
int flags = (Build.VERSION.SDK_INT < Build.VERSION_CODES.M ? 0 : PackageManager.MATCH_ALL); int flags = (Build.VERSION.SDK_INT < Build.VERSION_CODES.M ? 0 : PackageManager.MATCH_ALL);
List<ResolveInfo> ris = pm.queryIntentActivities(intent, flags); List<ResolveInfo> ris = pm.queryIntentActivities(intent, flags);
for (ResolveInfo ri : ris) { for (ResolveInfo ri : ris) {
CharSequence label = pm.getApplicationLabel(ri.activityInfo.applicationInfo); CharSequence label = ri.activityInfo.applicationInfo.loadLabel(pm);
if (label == null) if (label == null)
continue; continue;
pkgs.add(new Package(label.toString(), ri.activityInfo.packageName, false)); pkgs.add(new Package(label, ri.activityInfo.packageName, false));
try { try {
Intent serviceIntent = new Intent(); Intent serviceIntent = new Intent();
@@ -139,10 +139,7 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
serviceIntent.setPackage(ri.activityInfo.packageName); serviceIntent.setPackage(ri.activityInfo.packageName);
boolean tabs = (pm.resolveService(serviceIntent, 0) != null); boolean tabs = (pm.resolveService(serviceIntent, 0) != null);
if (tabs) if (tabs)
pkgs.add(new Package( pkgs.add(new Package(label, ri.activityInfo.packageName, true));
getString(R.string.title_browse_embedded, label),
ri.activityInfo.packageName,
tabs));
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(ex); Log.e(ex);
} }
@@ -643,11 +640,11 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
} }
private static class Package { private static class Package {
String title; CharSequence title;
String name; String name;
boolean tabs; boolean tabs;
public Package(String title, String name, boolean tabs) { public Package(CharSequence title, String name, boolean tabs) {
this.title = title; this.title = title;
this.name = name; this.name = name;
this.tabs = tabs; this.tabs = tabs;
@@ -655,7 +652,7 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
@Override @Override
public String toString() { public String toString() {
return title; return this.title + (tabs ? "" : " \u29c9");
} }
} }
} }

1
app/src/main/res/values/strings.xml
View File

@@ -1871,7 +1871,6 @@
<string name="title_insert_arrow" translatable="false">Insert arrow</string> <string name="title_insert_arrow" translatable="false">Insert arrow</string>
<string name="title_add">Add</string> <string name="title_add">Add</string>
<string name="title_browse">Open with</string> <string name="title_browse">Open with</string>
<string name="title_browse_embedded">%1$s (embedded)</string>
<string name="title_info">Info</string> <string name="title_info">Info</string>
<string name="title_download">Download</string> <string name="title_download">Download</string>
<string name="title_report">Report</string> <string name="title_report">Report</string>