diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml index 716715ba117e6ba37e5ab5f4bf7c8529e11b683c..b08c7d7b36aef820988523fada53c195ba7f8d3b 100644 --- a/briar-android/res/values/strings.xml +++ b/briar-android/res/values/strings.xml @@ -17,6 +17,8 @@ <string name="startup_failed_notification_text">You may need to reinstall Briar.</string> <string name="expiry_warning">This software has expired.\nPlease install a newer version.</string> <string name="contact_list_button">Contacts</string> + <string name="delete_contact">Delete contact</string> + <string name="contact_deleted_toast">Contact deleted</string> <string name="forums_button">Forums</string> <string name="settings_button">Settings</string> <string name="sign_out_button">Sign Out</string> diff --git a/briar-android/src/org/briarproject/android/contact/WritePrivateMessageActivity.java b/briar-android/src/org/briarproject/android/contact/WritePrivateMessageActivity.java index 3c2d6ed33c1c711d679840108adfd6199f1205cd..744170e03ad34564f7d35e5fad350bb700ceb96b 100644 --- a/briar-android/src/org/briarproject/android/contact/WritePrivateMessageActivity.java +++ b/briar-android/src/org/briarproject/android/contact/WritePrivateMessageActivity.java @@ -39,7 +39,6 @@ import org.briarproject.api.messaging.MessageId; import org.briarproject.util.StringUtils; import android.content.Intent; -import android.content.res.Resources; import android.os.Bundle; import android.text.InputType; import android.view.View; @@ -168,8 +167,7 @@ implements OnClickListener { private void displayLocalAuthor() { runOnUiThread(new Runnable() { public void run() { - Resources res = getResources(); - String format = res.getString(R.string.format_from); + String format = getString(R.string.format_from); String name = localAuthor.getName(); from.setText(String.format(format, name)); sendButton.setEnabled(true); diff --git a/briar-android/src/org/briarproject/android/invitation/AddContactActivity.java b/briar-android/src/org/briarproject/android/invitation/AddContactActivity.java index 83e707f1724a7bdd19b9fc7d09e068a0936b03ee..60c052051a98e6e5c0059d56b708e53814cc35c6 100644 --- a/briar-android/src/org/briarproject/android/invitation/AddContactActivity.java +++ b/briar-android/src/org/briarproject/android/invitation/AddContactActivity.java @@ -139,7 +139,7 @@ implements InvitationListener { } private void showToastAndFinish() { - String format = getResources().getString(R.string.contact_added_toast); + String format = getString(R.string.contact_added_toast); String text = String.format(format, contactName); Toast.makeText(this, text, LENGTH_LONG).show(); finish(); diff --git a/briar-android/src/org/briarproject/android/invitation/ConfirmationCodeView.java b/briar-android/src/org/briarproject/android/invitation/ConfirmationCodeView.java index 1002a8c0c264c228b0af5ef8bf867d194dddd3a9..7c52cd880b0e1395a8e025e4953699d2f995e742 100644 --- a/briar-android/src/org/briarproject/android/invitation/ConfirmationCodeView.java +++ b/briar-android/src/org/briarproject/android/invitation/ConfirmationCodeView.java @@ -6,7 +6,6 @@ import static android.view.Gravity.CENTER_HORIZONTAL; import org.briarproject.R; import android.content.Context; -import android.content.res.Resources; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -50,8 +49,8 @@ class ConfirmationCodeView extends AddContactView implements CodeEntryListener { addView(code); CodeEntryView codeEntry = new CodeEntryView(ctx); - Resources res = getResources(); - codeEntry.init(this, res.getString(R.string.enter_confirmation_code)); + String enter = container.getString(R.string.enter_confirmation_code); + codeEntry.init(this, enter); addView(codeEntry); } diff --git a/briar-android/src/org/briarproject/android/invitation/ConnectionView.java b/briar-android/src/org/briarproject/android/invitation/ConnectionView.java index edc63b0ca73336e21e0a003af9a53804aa1786af..e85b100c0cf0a26c3d843bf09603f01afd7deebc 100644 --- a/briar-android/src/org/briarproject/android/invitation/ConnectionView.java +++ b/briar-android/src/org/briarproject/android/invitation/ConnectionView.java @@ -44,7 +44,7 @@ class ConnectionView extends AddContactView { TextView connecting = new TextView(ctx); int remoteCode = container.getRemoteInvitationCode(); - String format = ctx.getResources().getString(R.string.searching_format); + String format = container.getString(R.string.searching_format); connecting.setText(String.format(format, remoteCode)); innerLayout.addView(connecting); diff --git a/briar-android/src/org/briarproject/android/invitation/InvitationCodeView.java b/briar-android/src/org/briarproject/android/invitation/InvitationCodeView.java index c099a67422b94ea9c1063eb1f87ecadc92a0c8fd..1f014fc0c9c09536ef78433c96927155011cf72c 100644 --- a/briar-android/src/org/briarproject/android/invitation/InvitationCodeView.java +++ b/briar-android/src/org/briarproject/android/invitation/InvitationCodeView.java @@ -5,7 +5,6 @@ import static android.view.Gravity.CENTER_HORIZONTAL; import org.briarproject.R; import android.content.Context; -import android.content.res.Resources; import android.widget.TextView; class InvitationCodeView extends AddContactView implements CodeEntryListener { @@ -32,8 +31,8 @@ class InvitationCodeView extends AddContactView implements CodeEntryListener { addView(code); CodeEntryView codeEntry = new CodeEntryView(ctx); - Resources res = getResources(); - codeEntry.init(this, res.getString(R.string.enter_invitation_code)); + String enter = container.getString(R.string.enter_invitation_code); + codeEntry.init(this, enter); addView(codeEntry); }