Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 02:39:05 +01:00
Code Issues Projects Releases Wiki Activity

removed step string

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-07-12 12:16:30 +02:00
parent 9a4bf598ae
commit 55601bc2c3
5 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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>

1
briar-android/res/values-pt-rBR/strings.xml
View File

@@ -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>

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

@@ -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>

18
briar-android/src/org/briarproject/android/invitation/AddContactActivity.java
View File

@@ -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) {

5
briar-android/src/org/briarproject/android/keyagreement/KeyAgreementActivity.java
View File

@@ -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());