|
@@ -38,7 +38,7 @@ class DcContext {
|
|
func getSecurejoinQr (chatId: Int) -> String? {
|
|
func getSecurejoinQr (chatId: Int) -> String? {
|
|
if let cString = dc_get_securejoin_qr(self.contextPointer, UInt32(chatId)) {
|
|
if let cString = dc_get_securejoin_qr(self.contextPointer, UInt32(chatId)) {
|
|
let swiftString = String(cString: cString)
|
|
let swiftString = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
return swiftString
|
|
return swiftString
|
|
}
|
|
}
|
|
return nil
|
|
return nil
|
|
@@ -59,7 +59,7 @@ class DcContext {
|
|
func getMsgInfo(msgId: Int) -> String {
|
|
func getMsgInfo(msgId: Int) -> String {
|
|
if let cString = dc_get_msg_info(self.contextPointer, UInt32(msgId)) {
|
|
if let cString = dc_get_msg_info(self.contextPointer, UInt32(msgId)) {
|
|
let swiftString = String(cString: cString)
|
|
let swiftString = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
return swiftString
|
|
return swiftString
|
|
}
|
|
}
|
|
return "ErrGetMsgInfo"
|
|
return "ErrGetMsgInfo"
|
|
@@ -68,7 +68,7 @@ class DcContext {
|
|
func initiateKeyTransfer() -> String? {
|
|
func initiateKeyTransfer() -> String? {
|
|
if let cString = dc_initiate_key_transfer(self.contextPointer) {
|
|
if let cString = dc_initiate_key_transfer(self.contextPointer) {
|
|
let swiftString = String(cString: cString)
|
|
let swiftString = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
return swiftString
|
|
return swiftString
|
|
}
|
|
}
|
|
return nil
|
|
return nil
|
|
@@ -83,7 +83,7 @@ class DcConfig {
|
|
private class func getConfig(_ key: String) -> String? {
|
|
private class func getConfig(_ key: String) -> String? {
|
|
guard let cString = dc_get_config(mailboxPointer, key) else { return nil }
|
|
guard let cString = dc_get_config(mailboxPointer, key) else { return nil }
|
|
let value = String(cString: cString)
|
|
let value = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
if value.isEmpty {
|
|
if value.isEmpty {
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|
|
@@ -372,7 +372,7 @@ class DcChat {
|
|
var name: String {
|
|
var name: String {
|
|
guard let cString = dc_chat_get_name(chatPointer) else { return "" }
|
|
guard let cString = dc_chat_get_name(chatPointer) else { return "" }
|
|
let swiftString = String(cString: cString)
|
|
let swiftString = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
return swiftString
|
|
return swiftString
|
|
}
|
|
}
|
|
|
|
|
|
@@ -399,7 +399,7 @@ class DcChat {
|
|
lazy var profileImage: UIImage? = { [unowned self] in
|
|
lazy var profileImage: UIImage? = { [unowned self] in
|
|
guard let cString = dc_chat_get_profile_image(chatPointer) else { return nil }
|
|
guard let cString = dc_chat_get_profile_image(chatPointer) else { return nil }
|
|
let filename = String(cString: cString)
|
|
let filename = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
let path: URL = URL(fileURLWithPath: filename, isDirectory: false)
|
|
let path: URL = URL(fileURLWithPath: filename, isDirectory: false)
|
|
if path.isFileURL {
|
|
if path.isFileURL {
|
|
do {
|
|
do {
|
|
@@ -417,7 +417,7 @@ class DcChat {
|
|
var subtitle: String? {
|
|
var subtitle: String? {
|
|
if let cString = dc_chat_get_subtitle(chatPointer) {
|
|
if let cString = dc_chat_get_subtitle(chatPointer) {
|
|
let str = String(cString: cString)
|
|
let str = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
return str.isEmpty ? nil : str
|
|
return str.isEmpty ? nil : str
|
|
}
|
|
}
|
|
return nil
|
|
return nil
|
|
@@ -526,7 +526,7 @@ class DcMsg: MessageType {
|
|
var text: String? {
|
|
var text: String? {
|
|
guard let cString = dc_msg_get_text(messagePointer) else { return nil }
|
|
guard let cString = dc_msg_get_text(messagePointer) else { return nil }
|
|
let swiftString = String(cString: cString)
|
|
let swiftString = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
return swiftString
|
|
return swiftString
|
|
}
|
|
}
|
|
|
|
|
|
@@ -584,7 +584,7 @@ class DcMsg: MessageType {
|
|
var file: String? {
|
|
var file: String? {
|
|
if let cString = dc_msg_get_file(messagePointer) {
|
|
if let cString = dc_msg_get_file(messagePointer) {
|
|
let str = String(cString: cString)
|
|
let str = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
return str.isEmpty ? nil : str
|
|
return str.isEmpty ? nil : str
|
|
}
|
|
}
|
|
|
|
|
|
@@ -594,7 +594,7 @@ class DcMsg: MessageType {
|
|
var filemime: String? {
|
|
var filemime: String? {
|
|
if let cString = dc_msg_get_filemime(messagePointer) {
|
|
if let cString = dc_msg_get_filemime(messagePointer) {
|
|
let str = String(cString: cString)
|
|
let str = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
return str.isEmpty ? nil : str
|
|
return str.isEmpty ? nil : str
|
|
}
|
|
}
|
|
|
|
|
|
@@ -604,7 +604,7 @@ class DcMsg: MessageType {
|
|
var filename: String? {
|
|
var filename: String? {
|
|
if let cString = dc_msg_get_filename(messagePointer) {
|
|
if let cString = dc_msg_get_filename(messagePointer) {
|
|
let str = String(cString: cString)
|
|
let str = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
return str.isEmpty ? nil : str
|
|
return str.isEmpty ? nil : str
|
|
}
|
|
}
|
|
|
|
|
|
@@ -663,14 +663,14 @@ class DcMsg: MessageType {
|
|
var setupCodeBegin: String {
|
|
var setupCodeBegin: String {
|
|
guard let cString = dc_msg_get_setupcodebegin(messagePointer) else { return "" }
|
|
guard let cString = dc_msg_get_setupcodebegin(messagePointer) else { return "" }
|
|
let swiftString = String(cString: cString)
|
|
let swiftString = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
return swiftString
|
|
return swiftString
|
|
}
|
|
}
|
|
|
|
|
|
func summary(chars: Int) -> String? {
|
|
func summary(chars: Int) -> String? {
|
|
guard let cString = dc_msg_get_summarytext(messagePointer, Int32(chars)) else { return nil }
|
|
guard let cString = dc_msg_get_summarytext(messagePointer, Int32(chars)) else { return nil }
|
|
let swiftString = String(cString: cString)
|
|
let swiftString = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
return swiftString
|
|
return swiftString
|
|
}
|
|
}
|
|
|
|
|
|
@@ -694,28 +694,28 @@ class DcContact {
|
|
var displayName: String {
|
|
var displayName: String {
|
|
guard let cString = dc_contact_get_display_name(contactPointer) else { return "" }
|
|
guard let cString = dc_contact_get_display_name(contactPointer) else { return "" }
|
|
let swiftString = String(cString: cString)
|
|
let swiftString = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
return swiftString
|
|
return swiftString
|
|
}
|
|
}
|
|
|
|
|
|
var nameNAddr: String {
|
|
var nameNAddr: String {
|
|
guard let cString = dc_contact_get_name_n_addr(contactPointer) else { return "" }
|
|
guard let cString = dc_contact_get_name_n_addr(contactPointer) else { return "" }
|
|
let swiftString = String(cString: cString)
|
|
let swiftString = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
return swiftString
|
|
return swiftString
|
|
}
|
|
}
|
|
|
|
|
|
var name: String {
|
|
var name: String {
|
|
guard let cString = dc_contact_get_name(contactPointer) else { return "" }
|
|
guard let cString = dc_contact_get_name(contactPointer) else { return "" }
|
|
let swiftString = String(cString: cString)
|
|
let swiftString = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
return swiftString
|
|
return swiftString
|
|
}
|
|
}
|
|
|
|
|
|
var email: String {
|
|
var email: String {
|
|
guard let cString = dc_contact_get_addr(contactPointer) else { return "" }
|
|
guard let cString = dc_contact_get_addr(contactPointer) else { return "" }
|
|
let swiftString = String(cString: cString)
|
|
let swiftString = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
return swiftString
|
|
return swiftString
|
|
}
|
|
}
|
|
|
|
|
|
@@ -730,7 +730,7 @@ class DcContact {
|
|
lazy var profileImage: UIImage? = { [unowned self] in
|
|
lazy var profileImage: UIImage? = { [unowned self] in
|
|
guard let cString = dc_contact_get_profile_image(contactPointer) else { return nil }
|
|
guard let cString = dc_contact_get_profile_image(contactPointer) else { return nil }
|
|
let filename = String(cString: cString)
|
|
let filename = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
let path: URL = URL(fileURLWithPath: filename, isDirectory: false)
|
|
let path: URL = URL(fileURLWithPath: filename, isDirectory: false)
|
|
if path.isFileURL {
|
|
if path.isFileURL {
|
|
do {
|
|
do {
|
|
@@ -780,7 +780,7 @@ class DcLot {
|
|
var text1: String? {
|
|
var text1: String? {
|
|
guard let cString = dc_lot_get_text1(dcLotPointer) else { return nil }
|
|
guard let cString = dc_lot_get_text1(dcLotPointer) else { return nil }
|
|
let swiftString = String(cString: cString)
|
|
let swiftString = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
return swiftString
|
|
return swiftString
|
|
}
|
|
}
|
|
|
|
|
|
@@ -791,7 +791,7 @@ class DcLot {
|
|
var text2: String? {
|
|
var text2: String? {
|
|
guard let cString = dc_lot_get_text2(dcLotPointer) else { return nil }
|
|
guard let cString = dc_lot_get_text2(dcLotPointer) else { return nil }
|
|
let swiftString = String(cString: cString)
|
|
let swiftString = String(cString: cString)
|
|
- free(cString)
|
|
|
|
|
|
+ dc_str_unref(cString)
|
|
return swiftString
|
|
return swiftString
|
|
}
|
|
}
|
|
|
|
|