mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-17 21:29:54 +01:00
removed step string
This commit is contained in:
@@ -25,7 +25,6 @@
|
|||||||
<string name="contact_list_title">Kontakte</string>
|
<string name="contact_list_title">Kontakte</string>
|
||||||
<string name="no_contacts">Keine Kontakte</string>
|
<string name="no_contacts">Keine Kontakte</string>
|
||||||
<string name="add_contact_title">Kontakt hinzufügen</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="continue_button">Weiter</string>
|
||||||
<string name="connection_failed">Verbindung fehlgeschlagen</string>
|
<string name="connection_failed">Verbindung fehlgeschlagen</string>
|
||||||
<string name="try_again_button">Noch einmal versuchen</string>
|
<string name="try_again_button">Noch einmal versuchen</string>
|
||||||
|
|||||||
@@ -41,7 +41,6 @@
|
|||||||
<string name="contact_list_title">Contatos</string>
|
<string name="contact_list_title">Contatos</string>
|
||||||
<string name="no_contacts">Nenhum contato</string>
|
<string name="no_contacts">Nenhum contato</string>
|
||||||
<string name="add_contact_title">Adicionar um 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="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="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>
|
<string name="continue_button">Continuar</string>
|
||||||
|
|||||||
@@ -43,7 +43,6 @@
|
|||||||
<string name="contact_list_title">Contacts</string>
|
<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="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">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="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="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>
|
<string name="continue_button">Continue</string>
|
||||||
|
|||||||
@@ -36,11 +36,6 @@ implements InvitationListener {
|
|||||||
static final int REQUEST_BLUETOOTH = 1;
|
static final int REQUEST_BLUETOOTH = 1;
|
||||||
static final int REQUEST_CREATE_IDENTITY = 2;
|
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 =
|
private static final Logger LOG =
|
||||||
Logger.getLogger(AddContactActivity.class.getName());
|
Logger.getLogger(AddContactActivity.class.getName());
|
||||||
|
|
||||||
@@ -199,18 +194,7 @@ implements InvitationListener {
|
|||||||
this.view = view;
|
this.view = view;
|
||||||
view.init(this);
|
view.init(this);
|
||||||
setContentView(view);
|
setContentView(view);
|
||||||
|
getSupportActionBar().setTitle(R.string.add_contact_title);
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void reset(AddContactView view) {
|
void reset(AddContactView view) {
|
||||||
|
|||||||
@@ -83,15 +83,12 @@ public class KeyAgreementActivity extends BriarFragmentActivity implements
|
|||||||
if (b != null)
|
if (b != null)
|
||||||
localAuthorId = new AuthorId(b);
|
localAuthorId = new AuthorId(b);
|
||||||
}
|
}
|
||||||
|
getSupportActionBar().setTitle(R.string.add_contact_title);
|
||||||
showStep(localAuthorId == null ? STEP_ID : STEP_QR);
|
showStep(localAuthorId == null ? STEP_ID : STEP_QR);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("ConstantConditions")
|
@SuppressWarnings("ConstantConditions")
|
||||||
private void showStep(int step) {
|
private void showStep(int step) {
|
||||||
getSupportActionBar().setTitle(
|
|
||||||
String.format(getString(R.string.add_contact_title_step), step,
|
|
||||||
STEPS));
|
|
||||||
switch (step) {
|
switch (step) {
|
||||||
case STEP_QR:
|
case STEP_QR:
|
||||||
startFragment(ShowQrCodeFragment.newInstance());
|
startFragment(ShowQrCodeFragment.newInstance());
|
||||||
|
|||||||
Reference in New Issue
Block a user