From 57c17e705f6f83e9ee1b524b935b7b868460eb8f Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Sat, 24 Jan 2015 10:15:13 -0800
Subject: [PATCH] Fix provisioning dialog strings.

// FREEBIE

Closes #2368
---
 res/values/strings.xml                        | 23 ++++++++++---------
 .../securesms/DeviceProvisioningActivity.java | 22 +++++++++---------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7eb337d313..545d70c105 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -240,20 +240,21 @@
     <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Incorrect old passphrase!</string>
 
     <!-- DeviceProvisioningActivity -->
-    <string name="DeviceProvisioning_cancel">CANCEL</string>
-    <string name="DeviceProvisioning_continue">CONTINUE</string>
-    <string name="DeviceProvisioning_title">Link this device?</string>
-    <string name="DeviceProvisioning_content_intro">It will be able to</string>
-    <string name="DeviceProvisioning_content_bullets">
+    <string name="DeviceProvisioningActivity_link_this_device">Link this device?</string>
+    <string name="DeviceProvisioningActivity_cancel">CANCEL</string>
+    <string name="DeviceProvisioningActivity_continue">CONTINUE</string>
+    <string name="DeviceProvisioningActivity_title">Link this device?</string>
+    <string name="DeviceProvisioningActivity_content_intro">It will be able to</string>
+    <string name="DeviceProvisioningActivity_content_bullets">
         - Read all your messages
         \n- Send messages in your name
     </string>
-    <string name="DeviceProvisioning_content_progress_title">Adding device...</string>
-    <string name="DeviceProvisioning_content_progress_content">Adding new device...</string>
-    <string name="DeviceProvisioning_content_progress_success">Device added!</string>
-    <string name="DeviceProvisioning_content_progress_no_device">No device found.</string>
-    <string name="DeviceProvisioning_content_progress_network_error">Network error.</string>
-    <string name="DeviceProvisioning_content_progress_key_error">Invalid QR code.</string>
+    <string name="DeviceProvisioningActivity_content_progress_title">Adding device...</string>
+    <string name="DeviceProvisioningActivity_content_progress_content">Adding new device...</string>
+    <string name="DeviceProvisioningActivity_content_progress_success">Device added!</string>
+    <string name="DeviceProvisioningActivity_content_progress_no_device">No device found.</string>
+    <string name="DeviceProvisioningActivity_content_progress_network_error">Network error.</string>
+    <string name="DeviceProvisioningActivity_content_progress_key_error">Invalid QR code.</string>
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Enter passphrase</string>
diff --git a/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java b/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java
index 3ab022acba..7f2c310e46 100644
--- a/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java
+++ b/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java
@@ -47,15 +47,15 @@ public class DeviceProvisioningActivity extends PassphraseRequiredActionBarActiv
     initializeResources();
 
     SpannableStringBuilder content = new SpannableStringBuilder();
-    content.append(getString(R.string.DeviceProvisioning_content_intro))
+    content.append(getString(R.string.DeviceProvisioningActivity_content_intro))
            .append("\n")
-           .append(small(getString(R.string.DeviceProvisioning_content_bullets)));
+           .append(small(getString(R.string.DeviceProvisioningActivity_content_bullets)));
 
-    new Builder(this).title("Link this device?")
+    new Builder(this).title(getString(R.string.DeviceProvisioningActivity_link_this_device))
                      .iconRes(R.drawable.icon_dialog)
                      .content(content)
-                     .positiveText(R.string.DeviceProvisioning_continue)
-                     .negativeText(R.string.DeviceProvisioning_cancel)
+                     .positiveText(R.string.DeviceProvisioningActivity_continue)
+                     .negativeText(R.string.DeviceProvisioningActivity_cancel)
                      .positiveColorRes(R.color.textsecure_primary)
                      .negativeColorRes(R.color.gray50)
                      .autoDismiss(false)
@@ -91,8 +91,8 @@ public class DeviceProvisioningActivity extends PassphraseRequiredActionBarActiv
 
   private void handleProvisioning(final MaterialDialog dialog) {
     new ProgressDialogAsyncTask<Void, Void, Integer>(this,
-                                                     R.string.DeviceProvisioning_content_progress_title,
-                                                     R.string.DeviceProvisioning_content_progress_content)
+                                                     R.string.DeviceProvisioningActivity_content_progress_title,
+                                                     R.string.DeviceProvisioningActivity_content_progress_content)
     {
       private static final int SUCCESS       = 0;
       private static final int NO_DEVICE     = 1;
@@ -133,16 +133,16 @@ public class DeviceProvisioningActivity extends PassphraseRequiredActionBarActiv
 
         switch (result) {
           case SUCCESS:
-            Toast.makeText(context, R.string.DeviceProvisioning_content_progress_success, Toast.LENGTH_SHORT).show();
+            Toast.makeText(context, R.string.DeviceProvisioningActivity_content_progress_success, Toast.LENGTH_SHORT).show();
             break;
           case NO_DEVICE:
-            Toast.makeText(context, R.string.DeviceProvisioning_content_progress_no_device, Toast.LENGTH_LONG).show();
+            Toast.makeText(context, R.string.DeviceProvisioningActivity_content_progress_no_device, Toast.LENGTH_LONG).show();
             break;
           case NETWORK_ERROR:
-            Toast.makeText(context, R.string.DeviceProvisioning_content_progress_network_error, Toast.LENGTH_LONG).show();
+            Toast.makeText(context, R.string.DeviceProvisioningActivity_content_progress_network_error, Toast.LENGTH_LONG).show();
             break;
           case KEY_ERROR:
-            Toast.makeText(context, R.string.DeviceProvisioning_content_progress_key_error, Toast.LENGTH_LONG).show();
+            Toast.makeText(context, R.string.DeviceProvisioningActivity_content_progress_key_error, Toast.LENGTH_LONG).show();
             break;
         }
         dialog.dismiss();