Merge branch 'bug-fixes-1.11.25' into bug-fix-for-calls

Session/Conversations/ConversationVC.swift

@@ -437,6 +437,12 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
         mediaCache.removeAllObjects()
     }
     
+    override func appDidBecomeActive(_ notification: Notification) {
+        // This is a workaround for an issue where the textview is not scrollable
+        // after the app goes into background and goes back in foreground.
+        self.snInputView.text = self.snInputView.text
+    }
+    
     deinit {
         NotificationCenter.default.removeObserver(self)
     }

Session/Home/HomeVC.swift

@@ -154,7 +154,6 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, NewConv
         notificationCenter.addObserver(self, selector: #selector(handleLocalProfileDidChangeNotification(_:)), name: Notification.Name(kNSNotificationName_LocalProfileDidChange), object: nil)
         notificationCenter.addObserver(self, selector: #selector(handleSeedViewedNotification(_:)), name: .seedViewed, object: nil)
         notificationCenter.addObserver(self, selector: #selector(handleBlockedContactsUpdatedNotification(_:)), name: .blockedContactsUpdated, object: nil)
-        notificationCenter.addObserver(self, selector: #selector(applicationDidBecomeActive(_:)), name: .OWSApplicationDidBecomeActive, object: nil)
         // Threads (part 2)
         threads = YapDatabaseViewMappings(groups: [ TSMessageRequestGroup, TSInboxGroup ], view: TSThreadDatabaseViewExtensionName) // The extension should be registered at this point
         threads.setIsReversed(true, forGroup: TSInboxGroup)
@@ -187,7 +186,7 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, NewConv
         reload()
     }
     
-    @objc private func applicationDidBecomeActive(_ notification: Notification) {
+    override func appDidBecomeActive(_ notification: Notification) {
         reload()
     }
     

Session/Shared/BaseVC.swift

@@ -25,6 +25,7 @@ class BaseVC : UIViewController {
     override func viewDidLoad() {
         setNeedsStatusBarAppearanceUpdate()
         NotificationCenter.default.addObserver(self, selector: #selector(handleAppModeChangedNotification(_:)), name: .appModeChanged, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(appDidBecomeActive(_:)), name: .OWSApplicationDidBecomeActive, object: nil)
     }
     
     internal func ensureWindowBackground() {
@@ -104,6 +105,10 @@ class BaseVC : UIViewController {
     deinit {
         NotificationCenter.default.removeObserver(self)
     }
+    
+    @objc func appDidBecomeActive(_ notification: Notification) {
+        // To be implemented by child class
+    }
 
     override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         if #available(iOS 13.0, *) {