Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1701,6 +1701,7 @@
};
A1B2C3D4E5F6A7B8C9D0E1F2 /* Strip Simulator Archs */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
Expand Down
8 changes: 3 additions & 5 deletions deltachat-ios/DC/PrvContext.swift
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ public class PrvContext {
return (false, nil, nil, "Core not initialized")
}

guard let currentUser = getCurrentUser() else {
guard getCurrentUser() != nil else {
return (false, nil, nil, "No user selected")
}

Expand All @@ -824,7 +824,7 @@ public class PrvContext {
}

let message = result["message"] as? String
let appStatus = result["app_status"]
_ = result["app_status"]

let successValue: Bool
if let value = result["success"] as? Bool {
Expand All @@ -839,8 +839,6 @@ public class PrvContext {

if successValue {
let data = result["data"] as? [String: Any]
let pduPresent = (data?["pdu"] as? String) != nil
let status = data?["status"] as? String ?? "?"
return (true, data, message, nil)
}

Expand Down Expand Up @@ -1289,7 +1287,7 @@ public class PrvContext {
return nil
}

return core.getSecureConnectionDisplayText(message)
return core.getSecureConnectionDisplayText(with: message)
}

/// Initialize a Privitty group chat
Expand Down
2 changes: 1 addition & 1 deletion docs/renew-push-certificate.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ These are the steps needed for renewal:

- open <https://developer.apple.com/account/resources/certificates/add>, hit "Create"
- select "Apple Push Notification service SSL (Sandbox & Production)"
- App ID: `8Y...A8.chat.delta`
- App ID: `9W...RW.chat.privitty`
- upload `CertificateSigningRequest.certSigningRequest` from above
- download locally to `certificates/YEAR-push-renew-NUMBER/aps.cer` (do not add to git)

Expand Down
Loading