yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 17:59:39 +02:00
Code Issues Releases Wiki Activity

reword, use 'continue' instead of 'ok'

Browse source
This commit is contained in:
B. Petersen 2020-09-07 15:50:46 +02:00
parent 34c217576e
commit fa214e0163
No known key found for this signature in database
GPG key ID: 3B88E92DEA8E9AFC
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
res/values/strings.xml
View file

@ -718,7 +718,7 @@
<!-- android specific strings, developers: please take care to remove strings that are no longer used! --> <!-- android specific strings, developers: please take care to remove strings that are no longer used! -->
<string name="pref_background_notifications">Background notifications</string> <string name="pref_background_notifications">Background notifications</string>
<string name="pref_background_notifications_explain">Uses a background connection to your server and requires ignored battery optimizations.</string> <string name="pref_background_notifications_explain">Uses a background connection to your server and requires ignored battery optimizations.</string>
<string name="pref_background_notifications_ask">To maintain connection to your server and receive messages in the background, ignore battery optimizations in the next step.\n\nDelta Chat uses few resources and takes care not to drain your battery.</string> <string name="pref_background_notifications_rationale">To maintain connection to your email server and receive messages in the background, ignore battery optimizations in the next step.\n\nDelta Chat uses few resources and takes care not to drain your battery.</string>
<!-- disabling "Reliable service" will hide a the maybe annoying permanent-notification with the drawback that new-message-notifications get potentially unreliable --> <!-- disabling "Reliable service" will hide a the maybe annoying permanent-notification with the drawback that new-message-notifications get potentially unreliable -->
<string name="pref_reliable_service">Reliable background connection</string> <string name="pref_reliable_service">Reliable background connection</string>
<string name="pref_reliable_service_explain">Requires a permanent notification</string> <string name="pref_reliable_service_explain">Requires a permanent notification</string>

4
src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java
View file

@ -113,8 +113,8 @@ public class DozeReminder {
&& !((PowerManager) context.getSystemService(Context.POWER_SERVICE)).isIgnoringBatteryOptimizations(context.getPackageName())) { && !((PowerManager) context.getSystemService(Context.POWER_SERVICE)).isIgnoringBatteryOptimizations(context.getPackageName())) {
new AlertDialog.Builder(context) new AlertDialog.Builder(context)
.setTitle(R.string.pref_background_notifications) .setTitle(R.string.pref_background_notifications)
.setMessage(R.string.pref_background_notifications_ask) .setMessage(R.string.pref_background_notifications_rationale)
.setPositiveButton(R.string.ok, (dialog, which) -> { .setPositiveButton(R.string.perm_continue, (dialog, which) -> {
Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS, Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
Uri.parse("package:" + context.getPackageName())); Uri.parse("package:" + context.getPackageName()));
context.startActivity(intent); context.startActivity(intent);