Merge pull request #1078 from deltachat/unsupported_audio

Unsupported audio

deltachat-ios/Chat/AudioController.swift

@@ -15,10 +15,16 @@ public enum PlayerState {
     case stopped
 }
 
+public protocol AudioControllerDelegate: AnyObject {
+    func onAudioPlayFailed()
+}
+
 /// The `AudioController` update UI for current audio cell that is playing a sound
 /// and also creates and manage an `AVAudioPlayer` states, play, pause and stop.
 open class AudioController: NSObject, AVAudioPlayerDelegate, AudioMessageCellDelegate {
 
+    open weak var delegate: AudioControllerDelegate?
+
     lazy var audioSession: AVAudioSession = {
         let audioSession = AVAudioSession.sharedInstance()
         _ = try? audioSession.setCategory(AVAudioSession.Category.playback, options: [.defaultToSpeaker])
@@ -46,10 +52,11 @@ open class AudioController: NSObject, AVAudioPlayerDelegate, AudioMessageCellDel
 
     // MARK: - Init Methods
 
-    public init(dcContext: DcContext, chatId: Int) {
+    public init(dcContext: DcContext, chatId: Int, delegate: AudioControllerDelegate? = nil) {
         self.dcContext = dcContext
         self.chatId = chatId
         self.chat = dcContext.getChat(chatId: chatId)
+        self.delegate = delegate
         super.init()
         NotificationCenter.default.addObserver(self,
                                                selector: #selector(audioRouteChanged),
@@ -118,9 +125,9 @@ open class AudioController: NSObject, AVAudioPlayerDelegate, AudioMessageCellDel
                 state = .playing
                 audioCell.audioPlayerView.showPlayLayout(true)  // show pause button on audio cell
                 startProgressTimer()
+            } else {
+                delegate?.onAudioPlayFailed()
             }
-
-            print("NewAudioController failed play sound becasue given message kind is not Audio")
         }
     }
 

deltachat-ios/Chat/ChatViewController.swift

@@ -201,7 +201,7 @@ class ChatViewController: UITableViewController {
     }()
 
     /// The `BasicAudioController` controll the AVAudioPlayer state (play, pause, stop) and update audio cell UI accordingly.
-    private lazy var audioController = AudioController(dcContext: dcContext, chatId: chatId)
+    private lazy var audioController = AudioController(dcContext: dcContext, chatId: chatId, delegate: self)
 
     private var disableWriting: Bool
     private var showNamesAboveMessage: Bool
@@ -406,6 +406,7 @@ class ChatViewController: UITableViewController {
             self.dcContext.marknoticedChat(chatId: self.chatId)
         }
         startTimer()
+        markSeenMessagesInVisibleArea()
     }
 
     override func viewWillDisappear(_ animated: Bool) {
@@ -603,6 +604,7 @@ class ChatViewController: UITableViewController {
             let visibleMessagesIds = indexPaths.map { UInt32(messageIds[$0.row]) }
             if !visibleMessagesIds.isEmpty {
                 DispatchQueue.global(qos: .background).async { [weak self] in
+                    logger.debug("markseen messages in chat \(String(describing: self?.chatId))")
                     self?.dcContext.markSeenMessages(messageIds: visibleMessagesIds)
                 }
             }
@@ -1065,6 +1067,7 @@ class ChatViewController: UITableViewController {
         if messageIds.firstIndex(where: { $0 == messageId }) != nil {
             DispatchQueue.global(qos: .background).async { [weak self] in
                 self?.dcContext.markSeenMessages(messageIds: [UInt32(messageId)])
+                logger.debug("markseen message updateMessage in chat \(String(describing: self?.chatId))")
             }
             let wasLastSectionVisible = self.isLastRowVisible()
             reloadData()
@@ -1081,6 +1084,7 @@ class ChatViewController: UITableViewController {
 
     func insertMessage(_ message: DcMsg) {
         DispatchQueue.global(qos: .background).async { [weak self] in
+            logger.debug("markseen messages insertMessage in chat \(String(describing: self?.chatId))")
             self?.dcContext.markSeenMessages(messageIds: [UInt32(message.id)])
         }
 
@@ -1505,3 +1509,11 @@ extension ChatViewController: QLPreviewControllerDelegate {
         }
     }
 }
+
+extension ChatViewController: AudioControllerDelegate {
+    func onAudioPlayFailed() {
+        let alert = UIAlertController(title: String.localized("error"), message: String.localized("cannot_play_unsupported_file_type"), preferredStyle: .safeActionSheet)
+        alert.addAction(UIAlertAction(title: String.localized("ok"), style: .default, handler: nil))
+        self.present(alert, animated: true, completion: nil)
+    }
+}

deltachat-ios/en.lproj/Localizable.strings

@@ -755,3 +755,5 @@
 "a11y_voice_message_hint_ios" = "After recording double-tap to send. To discard the recording scrub left-right with two fingers.";
 "login_error_no_internet_connection" = "No internet connection, can\'t log in to your server.";
 "share_account_not_configured" = "Account is not configured.";
+"cannot_play_unsupported_file_type" = "The audio file cannot be played.";
+

scripts/untranslated.xml

@@ -8,4 +8,5 @@
     <string name="a11y_voice_message_hint_ios">After recording double-tap to send. To discard the recording scrub left-right with two fingers.</string>
     <string name="login_error_no_internet_connection">No internet connection, can\'t log in to your server.</string>
     <string name="share_account_not_configured">Account is not configured.</string>
+    <string name="cannot_play_unsupported_file_type">The audio file cannot be played.</string>
 </resources>