TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-17 14:58:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Updated the copy for the Giphy warning prompt
This commit is contained in:
Morgan Pretty 2023-02-15 10:18:42 +11:00 committed by GitHub
commit 5949a158d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1439,16 +1439,16 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
val hasSeenGIFMetaDataWarning: Boolean = textSecurePreferences.hasSeenGIFMetaDataWarning() val hasSeenGIFMetaDataWarning: Boolean = textSecurePreferences.hasSeenGIFMetaDataWarning()
if (!hasSeenGIFMetaDataWarning) { if (!hasSeenGIFMetaDataWarning) {
val builder = AlertDialog.Builder(this) 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() textSecurePreferences.setHasSeenGIFMetaDataWarning()
AttachmentManager.selectGif(this, PICK_GIF) AttachmentManager.selectGif(this, PICK_GIF)
dialog.dismiss() dialog.dismiss()
} }
builder.setNegativeButton( builder.setNegativeButton(R.string.cancel) { dialog: DialogInterface, _: Int ->
"Cancel" dialog.dismiss()
) { dialog: DialogInterface, _: Int -> dialog.dismiss() } }
builder.create().show() builder.create().show()
} else { } else {
AttachmentManager.selectGif(this, PICK_GIF) AttachmentManager.selectGif(this, PICK_GIF)

2
app/src/main/res/values/strings.xml
View File

@ -871,4 +871,6 @@
<string name="delivery_status_read">Read</string> <string name="delivery_status_read">Read</string>
<string name="delivery_status_sent">Sent</string> <string name="delivery_status_sent">Sent</string>
<string name="delivery_status_failed">Failed to send</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> </resources>