Merge pull request #1117 from mpretty-cyro/feature/update-giphy-warning-copy

Updated the copy for the Giphy warning prompt

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -1439,16 +1439,16 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         val hasSeenGIFMetaDataWarning: Boolean = textSecurePreferences.hasSeenGIFMetaDataWarning()
         if (!hasSeenGIFMetaDataWarning) {
             val builder = AlertDialog.Builder(this)
-            builder.setTitle("Search GIFs?")
+            builder.setTitle(R.string.giphy_permission_title)
-            builder.setMessage("You will not have full metadata protection when sending GIFs.")
+            builder.setMessage(R.string.giphy_permission_message)
-            builder.setPositiveButton("OK") { dialog: DialogInterface, _: Int ->
+            builder.setPositiveButton(R.string.continue_2) { dialog: DialogInterface, _: Int ->
                 textSecurePreferences.setHasSeenGIFMetaDataWarning()
                 AttachmentManager.selectGif(this, PICK_GIF)
                 dialog.dismiss()
             }
-            builder.setNegativeButton(
+            builder.setNegativeButton(R.string.cancel) { dialog: DialogInterface, _: Int ->
-                "Cancel"
+                dialog.dismiss()
-            ) { dialog: DialogInterface, _: Int -> dialog.dismiss() }
+            }
             builder.create().show()
         } else {
             AttachmentManager.selectGif(this, PICK_GIF)

app/src/main/res/values/strings.xml

@@ -871,4 +871,6 @@
     <string name="delivery_status_read">Read</string>
     <string name="delivery_status_sent">Sent</string>
     <string name="delivery_status_failed">Failed to send</string>
+    <string name="giphy_permission_title">Search GIFs?</string>
+    <string name="giphy_permission_message">Session will connect to Giphy to provide search results. You will not have full metadata protection when sending GIFs.</string>
 </resources>