From 55601bc2c3def18db5e89e42c41699775d0cfdfc Mon Sep 17 00:00:00 2001
From: Ernir Erlingsson <ernir@ymirmobile.com>
Date: Tue, 12 Jul 2016 12:16:30 +0200
Subject: [PATCH] removed step string
---
briar-android/res/values-de/strings.xml | 1 -
briar-android/res/values-pt-rBR/strings.xml | 1 -
briar-android/res/values/strings.xml | 1 -
.../android/invitation/AddContactActivity.java | 18 +-----------------
.../keyagreement/KeyAgreementActivity.java | 5 +----
5 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/briar-android/res/values-de/strings.xml b/briar-android/res/values-de/strings.xml
index 19f6a0348f..4275faf7a6 100644
--- a/briar-android/res/values-de/strings.xml
+++ b/briar-android/res/values-de/strings.xml
@@ -25,7 +25,6 @@
<string name="contact_list_title">Kontakte</string>
<string name="no_contacts">Keine Kontakte</string>
<string name="add_contact_title">Kontakt hinzufügen</string>
- <string name="add_contact_title_step">Kontakt hinzufügen - Schritt %1$d/%2$d</string>
<string name="continue_button">Weiter</string>
<string name="connection_failed">Verbindung fehlgeschlagen</string>
<string name="try_again_button">Noch einmal versuchen</string>
diff --git a/briar-android/res/values-pt-rBR/strings.xml b/briar-android/res/values-pt-rBR/strings.xml
index 026ab7179a..4bb995c471 100644
--- a/briar-android/res/values-pt-rBR/strings.xml
+++ b/briar-android/res/values-pt-rBR/strings.xml
@@ -41,7 +41,6 @@
<string name="contact_list_title">Contatos</string>
<string name="no_contacts">Nenhum contato</string>
<string name="add_contact_title">Adicionar um contato</string>
- <string name="add_contact_title_step">Adicionar um contato - Passo %1$d/%2$d</string>
<string name="your_nickname">Escolha a identidade que você quer usar:</string>
<string name="face_to_face">Você deve estar frente-a-frente com a pessoal que deseja adicionar como contato. Isso evita que alguém se passe por você ou leia suas mensagens no futuro.</string>
<string name="continue_button">Continuar</string>
diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml
index 9856adbc65..b9cf51ef47 100644
--- a/briar-android/res/values/strings.xml
+++ b/briar-android/res/values/strings.xml
@@ -43,7 +43,6 @@
<string name="contact_list_title">Contacts</string>
<string name="no_contacts">It seems that you are new here and have no contacts yet.\n\nTap the + icon at the top and follow the instructions to add some friends to your list.\n\nPlease remember: You can only add new contacts face-to-face to prevent anyone from impersonating you or reading your messages in the future.</string>
<string name="add_contact_title">Add a Contact</string>
- <string name="add_contact_title_step">Add a Contact - Step %1$d/%2$d</string>
<string name="your_nickname">Choose the identity you want to use:</string>
<string name="face_to_face">You must be face-to-face with the person you want to add as a contact. This will prevent anyone from impersonating you or reading your messages in future.</string>
<string name="continue_button">Continue</string>
diff --git a/briar-android/src/org/briarproject/android/invitation/AddContactActivity.java b/briar-android/src/org/briarproject/android/invitation/AddContactActivity.java
index acd8d36a14..5e070ba890 100644
--- a/briar-android/src/org/briarproject/android/invitation/AddContactActivity.java
+++ b/briar-android/src/org/briarproject/android/invitation/AddContactActivity.java
@@ -36,11 +36,6 @@ implements InvitationListener {
static final int REQUEST_BLUETOOTH = 1;
static final int REQUEST_CREATE_IDENTITY = 2;
- private static final int STEP_CHOOSE = 1;
- private static final int STEP_INVITE = 2;
- private static final int STEP_CONFIRM = 3;
- private static final int STEPS = 3;
-
private static final Logger LOG =
Logger.getLogger(AddContactActivity.class.getName());
@@ -199,18 +194,7 @@ implements InvitationListener {
this.view = view;
view.init(this);
setContentView(view);
-
- int step = 0;
- if (view instanceof ChooseIdentityView) step = STEP_CHOOSE;
- else if (view instanceof InvitationCodeView) step = STEP_INVITE;
- else if (view instanceof ConfirmationCodeView) step = STEP_CONFIRM;
- if (step > 0) {
- getSupportActionBar().setTitle(
- String.format(getString(R.string.add_contact_title_step),
- step, STEPS));
- } else {
- getSupportActionBar().setTitle(R.string.add_contact_title);
- }
+ getSupportActionBar().setTitle(R.string.add_contact_title);
}
void reset(AddContactView view) {
diff --git a/briar-android/src/org/briarproject/android/keyagreement/KeyAgreementActivity.java b/briar-android/src/org/briarproject/android/keyagreement/KeyAgreementActivity.java
index e72e742e25..e64ad7fa70 100644
--- a/briar-android/src/org/briarproject/android/keyagreement/KeyAgreementActivity.java
+++ b/briar-android/src/org/briarproject/android/keyagreement/KeyAgreementActivity.java
@@ -83,15 +83,12 @@ public class KeyAgreementActivity extends BriarFragmentActivity implements
if (b != null)
localAuthorId = new AuthorId(b);
}
-
+ getSupportActionBar().setTitle(R.string.add_contact_title);
showStep(localAuthorId == null ? STEP_ID : STEP_QR);
}
@SuppressWarnings("ConstantConditions")
private void showStep(int step) {
- getSupportActionBar().setTitle(
- String.format(getString(R.string.add_contact_title_step), step,
- STEPS));
switch (step) {
case STEP_QR:
startFragment(ShowQrCodeFragment.newInstance());
--
GitLab