Merge pull request #379 from deltachat/r10s-device-msg

tweak support for device-chat

deltachat-ios/AppDelegate.swift

@@ -178,6 +178,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         dc_set_stock_translation(mailboxPointer, UInt32(DC_STR_SERVER_RESPONSE), String.localized("login_error_server_response"))
         dc_set_stock_translation(mailboxPointer, UInt32(DC_STR_MSGACTIONBYUSER), String.localized("systemmsg_action_by_user"))
         dc_set_stock_translation(mailboxPointer, UInt32(DC_STR_MSGACTIONBYME), String.localized("systemmsg_action_by_me"))
+        dc_set_stock_translation(mailboxPointer, UInt32(DC_STR_DEVICE_MESSAGES), String.localized("device_talk"))
     }
 
     func stop() {

deltachat-ios/Controller/ChatViewController.swift

@@ -35,7 +35,7 @@ class ChatViewController: MessagesViewController {
     /// The `BasicAudioController` controll the AVAudioPlayer state (play, pause, stop) and udpate audio cell UI accordingly.
     open lazy var audioController = BasicAudioController(messageCollectionView: messagesCollectionView)
 
-    var disableWriting = false
+    private var disableWriting: Bool
     var showCustomNavBar = true
     var previewView: UIView?
     var previewController: PreviewController?
@@ -50,6 +50,7 @@ class ChatViewController: MessagesViewController {
     init(dcContext: DcContext, chatId: Int) {
         self.dcContext = dcContext
         self.chatId = chatId
+        self.disableWriting = !DcChat(id: chatId).canSend
         super.init(nibName: nil, bundle: nil)
         hidesBottomBarWhenPushed = true
     }
@@ -90,7 +91,9 @@ class ChatViewController: MessagesViewController {
             if chat.isGroup {
                 subtitle = String.localizedStringWithFormat(NSLocalizedString("n_members", comment: ""), chatContactIds.count)
             } else if chatContactIds.count >= 1 {
-                if chat.isSelfTalk {
+                if chat.isDeviceTalk {
+                    subtitle = String.localized("device_talk_subtitle")
+                } else if chat.isSelfTalk {
                     subtitle = String.localized("chat_self_talk_subtitle")
                 } else {
                     subtitle = DcContact(id: chatContactIds[0]).email

deltachat-ios/Controller/MailboxViewController.swift

@@ -5,7 +5,6 @@ class MailboxViewController: ChatViewController {
     override init(dcContext: DcContext, chatId: Int) {
         super.init(dcContext: dcContext, chatId: chatId)
         hidesBottomBarWhenPushed = true
-        disableWriting = true
         showCustomNavBar = false
     }
 

deltachat-ios/DC/Wrapper.swift

@@ -440,6 +440,14 @@ class DcChat {
         return Int(dc_chat_is_self_talk(chatPointer)) != 0
     }
 
+    var isDeviceTalk: Bool {
+        return Int(dc_chat_is_device_talk(chatPointer)) != 0
+    }
+
+    var canSend: Bool {
+        return Int(dc_chat_can_send(chatPointer)) != 0
+    }
+
     var isVerified: Bool {
         return dc_chat_is_verified(chatPointer) > 0
     }