tweak verified (#1959)

* remove 40k auto-download option * set stock translation for 'group created, send first message' * update 'learn more' links
deltachat · Nov 7, 2023 · 50a6a56 · 50a6a56
1 parent 0462d54
commit 50a6a56
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/deltachat-ios/AppDelegate.swift b/deltachat-ios/AppDelegate.swift
@@ -752,6 +752,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         dcContext.setStockTranslation(id: DC_STR_EPHEMERAL_TIMER_WEEKS_BY_OTHER, localizationKey: "ephemeral_timer_weeks_by_other")
         dcContext.setStockTranslation(id: DC_STR_CHAT_PROTECTION_ENABLED, localizationKey: "chat_protection_enabled_tap_to_learn_more")
         dcContext.setStockTranslation(id: DC_STR_CHAT_PROTECTION_DISABLED, localizationKey: "chat_protection_broken_tap_to_learn_more")
+        dcContext.setStockTranslation(id: DC_STR_NEW_GROUP_SEND_FIRST_MESSAGE, localizationKey: "chat_new_group_hint")
     }
 
     func appIsInForeground() -> Bool {

diff --git a/deltachat-ios/Chat/ChatViewController.swift b/deltachat-ios/Chat/ChatViewController.swift
@@ -1599,7 +1599,7 @@ class ChatViewController: UITableViewController, UITableViewDropDelegate {
     private func showProtectionBrokenDialog() {
         let alert = UIAlertController(title: String.localizedStringWithFormat(String.localized("chat_protection_broken_explanation"), dcChat.name), message: nil, preferredStyle: .alert)
         alert.addAction(UIAlertAction(title: String.localized("learn_more"), style: .default, handler: { _ in
-            if let url = URL(string: "https://staging.delta.chat/733/en/help#verificationbroken") {
+            if let url = URL(string: "https://staging.delta.chat/746/en/help#nocryptanymore") {
                 UIApplication.shared.open(url)
             }
         }))
@@ -1615,7 +1615,7 @@ class ChatViewController: UITableViewController, UITableViewDropDelegate {
     private func showProtectionEnabledDialog() {
         let alert = UIAlertController(title: String.localized("chat_protection_enabled_explanation"), message: nil, preferredStyle: .alert)
         alert.addAction(UIAlertAction(title: String.localized("learn_more"), style: .default, handler: { _ in
-            if let url = URL(string: "https://staging.delta.chat/733/en/help#verifiedchats") {
+            if let url = URL(string: "https://staging.delta.chat/746/en/help#e2eeguarantee") {
                 UIApplication.shared.open(url)
             }
         }))

diff --git a/deltachat-ios/Controller/GroupMembersViewController.swift b/deltachat-ios/Controller/GroupMembersViewController.swift
@@ -149,7 +149,7 @@ class GroupMembersViewController: UITableViewController {
                 if verifiedContactRequired && !dcContext.getContact(id: contactId).isVerified {
                     let alert = UIAlertController(title: String.localized("verified_contact_required_explain"), message: nil, preferredStyle: .alert)
                     alert.addAction(UIAlertAction(title: String.localized("learn_more"), style: .default, handler: { _ in
-                        if let url = URL(string: "https://delta.chat/en/help#verifiedchats") {
+                        if let url = URL(string: "https://staging.delta.chat/746/en/help#howtoe2ee") {
                             UIApplication.shared.open(url)
                         }
                     }))

diff --git a/deltachat-ios/Controller/Settings/DownloadOnDemandViewController.swift b/deltachat-ios/Controller/Settings/DownloadOnDemandViewController.swift
@@ -16,7 +16,7 @@ class DownloadOnDemandViewController: UITableViewController {
 
     init(dcContext: DcContext) {
         self.dcContext = dcContext
-        self.options = [0, 40960, 163840, 655360, 5242880, 26214400]
+        self.options = [0, 163840, 655360, 5242880, 26214400]
         super.init(style: .grouped)
         self.title = String.localized("auto_download_messages")
         hidesBottomBarWhenPushed = true
@@ -30,9 +30,7 @@ class DownloadOnDemandViewController: UITableViewController {
         switch val {
         case 0:
             return String.localized("pref_show_emails_all")
-        case 40960:
-            return String.localizedStringWithFormat(String.localized("up_to_x"), "40 KiB")
-        case 163840:
+        case 40960, 163840:
             return String.localizedStringWithFormat(String.localized("up_to_x_most_worse_quality_images"), "160 KiB")
         case 655360:
             return String.localizedStringWithFormat(String.localized("up_to_x_most_balanced_quality_images"), "640 KiB")