Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 06:09:55 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1654-notification-channel-unavailable' into 'master'

Browse Source 
Fail gracefully when ACTION_CHANNEL_NOTIFICATION_SETTINGS is not available

Closes #1654

See merge request briar/briar!1192
This commit is contained in:
akwizgran
2019-11-06 09:49:21 +00:00
parent aeefa35f38 72aa5397f8
commit 98a4f5def1
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
View File

@@ -495,7 +495,13 @@ public class SettingsFragment extends PreferenceFragmentCompat
Intent intent = new Intent(ACTION_CHANNEL_NOTIFICATION_SETTINGS) Intent intent = new Intent(ACTION_CHANNEL_NOTIFICATION_SETTINGS)
.putExtra(EXTRA_APP_PACKAGE, packageName) .putExtra(EXTRA_APP_PACKAGE, packageName)
.putExtra(EXTRA_CHANNEL_ID, channelId); .putExtra(EXTRA_CHANNEL_ID, channelId);
startActivity(intent); Context ctx = requireContext();
if (intent.resolveActivity(ctx.getPackageManager()) != null) {
startActivity(intent);
} else {
Toast.makeText(ctx, R.string.error_start_activity, LENGTH_SHORT)
.show();
}
return true; return true;
}); });
} }

1
briar-android/src/main/res/values/strings.xml
View File

@@ -120,6 +120,7 @@
<string name="fix">Fix</string> <string name="fix">Fix</string>
<string name="help">Help</string> <string name="help">Help</string>
<string name="sorry">Sorry</string> <string name="sorry">Sorry</string>
<string name="error_start_activity">Unavailable on your system</string>
<!-- Contacts and Private Conversations--> <!-- Contacts and Private Conversations-->
<string name="no_contacts">No contacts to show</string> <string name="no_contacts">No contacts to show</string>