From 38f46a9c60e1b05752dd253e152af388939777d8 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 21 Nov 2016 17:39:44 -0200
Subject: [PATCH] Make dialog actions consistent
---
briar-android/res/values/strings.xml | 1 +
.../android/contact/ConversationActivity.java | 4 ++--
.../android/panic/PanicPreferencesFragment.java | 10 ++++++----
.../privategroup/reveal/RevealContactsActivity.java | 2 +-
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml
index ae9b511476..e27a3ea9ca 100644
--- a/briar-android/res/values/strings.xml
+++ b/briar-android/res/values/strings.xml
@@ -78,6 +78,7 @@
<string name="online">Online</string>
<string name="offline">Offline</string>
<string name="send">Send</string>
+ <string name="allow">Allow</string>
<string name="no_data">No data</string>
<string name="ellipsis">…</string>
<string name="text_too_long">The entered text is too long</string>
diff --git a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
index 41e8c08fb6..02779ce442 100644
--- a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
+++ b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
@@ -686,8 +686,8 @@ public class ConversationActivity extends BriarActivity
R.style.BriarDialogTheme);
builder.setTitle(getString(R.string.dialog_title_delete_contact));
builder.setMessage(getString(R.string.dialog_message_delete_contact));
- builder.setPositiveButton(android.R.string.ok, okListener);
- builder.setNegativeButton(android.R.string.cancel, null);
+ builder.setNegativeButton(R.string.delete, okListener);
+ builder.setPositiveButton(R.string.cancel, null);
builder.show();
}
diff --git a/briar-android/src/org/briarproject/android/panic/PanicPreferencesFragment.java b/briar-android/src/org/briarproject/android/panic/PanicPreferencesFragment.java
index f2f6973943..f62dc03852 100644
--- a/briar-android/src/org/briarproject/android/panic/PanicPreferencesFragment.java
+++ b/briar-android/src/org/briarproject/android/panic/PanicPreferencesFragment.java
@@ -17,6 +17,7 @@ import android.support.v7.preference.PreferenceFragmentCompat;
import android.text.TextUtils;
import org.briarproject.R;
+import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.logging.Logger;
@@ -72,8 +73,8 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat
}
}
- ArrayList<CharSequence> entries = new ArrayList<CharSequence>();
- ArrayList<CharSequence> entryValues = new ArrayList<CharSequence>();
+ ArrayList<CharSequence> entries = new ArrayList<>();
+ ArrayList<CharSequence> entryValues = new ArrayList<>();
entries.add(0, getString(R.string.panic_app_setting_none));
entryValues.add(0, Panic.PACKAGE_NAME_NONE);
@@ -245,11 +246,12 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat
String text = String.format(
getString(R.string.dialog_message_connect_panic_app), app);
builder.setMessage(text);
- builder.setPositiveButton(android.R.string.ok, okListener);
- builder.setNegativeButton(android.R.string.cancel, cancelListener);
+ builder.setNegativeButton(R.string.allow, okListener);
+ builder.setPositiveButton(R.string.cancel, cancelListener);
builder.show();
}
+ @Nullable
private String getCallingPackageName() {
ComponentName componentName = getActivity().getCallingActivity();
String packageName = null;
diff --git a/briar-android/src/org/briarproject/android/privategroup/reveal/RevealContactsActivity.java b/briar-android/src/org/briarproject/android/privategroup/reveal/RevealContactsActivity.java
index cae47760bf..3a7bd88ee8 100644
--- a/briar-android/src/org/briarproject/android/privategroup/reveal/RevealContactsActivity.java
+++ b/briar-android/src/org/briarproject/android/privategroup/reveal/RevealContactsActivity.java
@@ -114,7 +114,7 @@ public class RevealContactsActivity extends ContactSelectorActivity
private void showOnboardingDialog() {
new AlertDialog.Builder(this, R.style.BriarDialogTheme)
.setMessage(getString(R.string.groups_reveal_dialog_message))
- .setPositiveButton(R.string.ok,
+ .setNeutralButton(R.string.ok,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog,
--
GitLab