Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tweak verified #1959

Merged
merged 3 commits into from
Nov 7, 2023
Merged

tweak verified #1959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f472ed
remove 40k auto-download option
r10s Nov 6, 2023
912fb82
set stock translation for 'group created, send first message'
r10s Nov 6, 2023
cca22a7
update 'learn more' links
r10s Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions deltachat-ios/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions deltachat-ios/Chat/ChatViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}))
Expand All @@ -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)
}
}))
Expand Down
2 changes: 1 addition & 1 deletion deltachat-ios/Controller/GroupMembersViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}))
Expand Down
6 changes: 2 additions & 4 deletions deltachat-ios/Controller/Settings/DownloadOnDemandViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")
Expand Down