SES-4433 : Handle landscape mode

app/src/main/AndroidManifest.xml

@@ -104,41 +104,33 @@
 
         <activity
             android:name="org.thoughtcrime.securesms.onboarding.landing.LandingActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Theme.Session.DayNight.FlatActionBar" />
         <activity
             android:name="org.thoughtcrime.securesms.onboarding.loadaccount.LoadAccountActivity"
-            android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.Session.DayNight.FlatActionBar" />
         <activity
             android:name="org.thoughtcrime.securesms.onboarding.loading.LoadingActivity"
-            android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.Session.DayNight.FlatActionBar" />
         <activity
             android:name="org.thoughtcrime.securesms.onboarding.pickname.PickDisplayNameActivity"
-            android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.Session.DayNight.FlatActionBar" />
         <activity
             android:name="org.thoughtcrime.securesms.onboarding.messagenotifications.MessageNotificationsActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Theme.Session.DayNight.FlatActionBar" />
         <activity
             android:name="org.thoughtcrime.securesms.home.HomeActivity"
-            android:screenOrientation="portrait"
             android:launchMode="singleTask"
             android:theme="@style/Theme.Session.DayNight.NoActionBar" />
         <activity
             android:name="org.thoughtcrime.securesms.messagerequests.MessageRequestsActivity"
             android:exported="false"
-            android:label="@string/sessionMessageRequests"
-            android:screenOrientation="portrait" />
+            android:label="@string/sessionMessageRequests"/>
 
         <activity
             android:name="org.thoughtcrime.securesms.preferences.SettingsActivity"
-            android:screenOrientation="portrait"
             android:label="@string/sessionSettings" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -147,62 +139,47 @@
 
         <activity
             android:name="org.thoughtcrime.securesms.debugmenu.DebugActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Theme.Session.DayNight.NoActionBar" />
         <activity
-            android:name="org.thoughtcrime.securesms.home.PathActivity"
-            android:screenOrientation="portrait" />
+            android:name="org.thoughtcrime.securesms.home.PathActivity"/>
         <activity
             android:name="org.thoughtcrime.securesms.preferences.QRCodeActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Theme.Session.DayNight.FlatActionBar" />
         <activity
             android:name="org.thoughtcrime.securesms.preferences.BlockedContactsActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Theme.Session.DayNight.FlatActionBar"
             android:label="@string/conversationsBlockedContacts"
             />
         <activity
             android:name="org.thoughtcrime.securesms.conversation.v2.settings.ConversationSettingsActivity"
             android:theme="@style/Theme.Session.DayNight.NoActionBar"
-            android:label="@string/sessionSettings"
-            android:screenOrientation="portrait" />
+            android:label="@string/sessionSettings" />
         <activity
             android:name="org.thoughtcrime.securesms.preferences.prosettings.ProSettingsActivity"
-            android:theme="@style/Theme.Session.DayNight.NoActionBar"
-            android:screenOrientation="portrait" />
+            android:theme="@style/Theme.Session.DayNight.NoActionBar" />
         <activity
-            android:name="org.thoughtcrime.securesms.recoverypassword.RecoveryPasswordActivity"
-            android:screenOrientation="portrait" />
+            android:name="org.thoughtcrime.securesms.recoverypassword.RecoveryPasswordActivity" />
         <activity
             android:name="org.thoughtcrime.securesms.preferences.PrivacySettingsActivity"
-            android:label="@string/sessionPrivacy"
-            android:screenOrientation="portrait" />
+            android:label="@string/sessionPrivacy" />
         <activity
-            android:name="org.thoughtcrime.securesms.preferences.NotificationSettingsActivity"
-            android:screenOrientation="portrait" />
+            android:name="org.thoughtcrime.securesms.preferences.NotificationSettingsActivity" />
         <activity
-            android:name="org.thoughtcrime.securesms.preferences.ChatSettingsActivity"
-            android:screenOrientation="portrait" />
+            android:name="org.thoughtcrime.securesms.preferences.ChatSettingsActivity" />
         <activity
             android:name="org.thoughtcrime.securesms.preferences.HelpSettingsActivity"
-            android:label="@string/sessionHelp"
-            android:screenOrientation="portrait" />
-        <activity android:name="org.thoughtcrime.securesms.preferences.appearance.AppearanceSettingsActivity"
-            android:screenOrientation="portrait"/>
+            android:label="@string/sessionHelp"/>
+        <activity android:name="org.thoughtcrime.securesms.preferences.appearance.AppearanceSettingsActivity" />
         <activity android:name="org.thoughtcrime.securesms.groups.GroupMembersActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Theme.Session.DayNight.NoActionBar" />
         <activity android:name="org.thoughtcrime.securesms.conversation.v2.settings.notification.NotificationSettingsActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Theme.Session.DayNight.NoActionBar" />
         <activity
             android:exported="true"
             android:name="org.thoughtcrime.securesms.ShareActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:excludeFromRecents="true"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait"
             android:noHistory="true"
             android:taskAffinity=""
             android:theme="@style/Theme.TextSecure.DayNight.NoActionBar"
@@ -254,7 +231,6 @@
 
         <activity
             android:name="org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2"
-            android:screenOrientation="portrait"
             android:parentActivityName="org.thoughtcrime.securesms.home.HomeActivity"
             android:theme="@style/Theme.Session.DayNight.NoActionBar"
             android:windowSoftInputMode="adjustResize" >
@@ -264,7 +240,6 @@
         </activity>
         <activity
             android:name="org.thoughtcrime.securesms.conversation.v2.MessageDetailActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Theme.Session.DayNight">
         </activity>
         <activity
@@ -281,14 +256,16 @@
             android:name="org.thoughtcrime.securesms.giph.ui.GiphyActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:theme="@style/Theme.Session.DayNight.NoActionBar"
-            android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden" />
         <activity
             android:name="org.thoughtcrime.securesms.mediasend.MediaSendActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:screenOrientation="portrait"
             android:theme="@style/Theme.Session.DayNight.NoActionBar"
-            android:windowSoftInputMode="stateHidden" />
+            android:windowSoftInputMode="stateHidden"/>
+        <activity
+            android:name="org.thoughtcrime.securesms.mediasend.CameraXActivity"
+            android:theme="@style/Theme.Session.DayNight.NoActionBar"
+            android:windowSoftInputMode="stateHidden"
+            android:configChanges="orientation|screenSize|keyboardHidden|layoutDirection"/>
         <activity
             android:name="org.thoughtcrime.securesms.MediaPreviewActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
@@ -317,10 +294,10 @@
             android:theme="@style/Theme.Session.DayNight.NoActionBar" />
         <activity android:name="org.thoughtcrime.securesms.webrtc.WebRtcCallActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
             android:showForAllUsers="true"
             android:parentActivityName="org.thoughtcrime.securesms.home.HomeActivity"
-            android:theme="@style/Theme.Session.DayNight.NoActionBar">
+            android:theme="@style/Theme.Session.DayNight.NoActionBar"
+            android:configChanges="orientation|screenSize|keyboardHidden|layoutDirection">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.thoughtcrime.securesms.home.HomeActivity" />

app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.kt

@@ -147,11 +147,11 @@ abstract class BaseActionBarActivity : AppCompatActivity() {
     }
 
     override fun onSupportNavigateUp(): Boolean {
-        if (super.onSupportNavigateUp()) return true
-
-        onBackPressed()
+        if (handleNavigateUp()) return true
+        onBackPressedDispatcher.onBackPressed()
         return true
     }
+    protected open fun handleNavigateUp(): Boolean = false
 
     private fun initializeScreenshotSecurity(isResume: Boolean) {
         if (!isResume) {

app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.kt

@@ -27,6 +27,7 @@ import android.net.Uri
 import android.os.AsyncTask
 import android.os.Build
 import android.os.Bundle
+import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuItem
@@ -100,6 +101,7 @@ import org.thoughtcrime.securesms.util.DateUtils
 import org.thoughtcrime.securesms.util.FilenameUtils.getFilenameFromUri
 import org.thoughtcrime.securesms.util.SaveAttachmentTask
 import org.thoughtcrime.securesms.util.SaveAttachmentTask.Companion.showOneTimeWarningDialogOrSave
+import org.thoughtcrime.securesms.util.applySafeInsetsPaddings
 import java.io.IOException
 import java.util.WeakHashMap
 import javax.inject.Inject
@@ -172,8 +174,12 @@ class MediaPreviewActivity : ScreenLockActionBarActivity(),
         ViewCompat.setOnApplyWindowInsetsListener(findViewById<View>(android.R.id.content)) { view, windowInsets ->
             val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime())
             windowInsetBottom = insets.bottom
-
-            binding.toolbar.updatePadding(top = insets.top)
+
+            binding.toolbar.updatePadding(
+                left = insets.left,
+                top = insets.top,
+                right = insets.right
+            )
             binding.mediaPreviewAlbumRailContainer.updatePadding(bottom = insets.bottom)
 
             updateControlsPosition()
@@ -258,9 +264,6 @@ class MediaPreviewActivity : ScreenLockActionBarActivity(),
     }
 
     private fun showAlbumRail() {
-        // never show the rail in landscape
-        if(isLandscape()) return
-
         val rail = binding.mediaPreviewAlbumRailContainer
         rail.animate().cancel()
         rail.visibility = View.VISIBLE
@@ -389,13 +392,11 @@ class MediaPreviewActivity : ScreenLockActionBarActivity(),
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
-        // always hide the rail in landscape
-        if (isLandscape()) {
-            hideAlbumRail()
+
+        if (!isFullscreen) {
+            showAlbumRail()
         } else {
-            if (!isFullscreen) {
-                showAlbumRail()
-            }
+            hideAlbumRail()
         }
 
         // Re-apply fullscreen if we were already in it

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -43,6 +43,7 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
+import androidx.core.view.updatePadding
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.Observer
@@ -684,6 +685,8 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
             val navInsets = windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars())
             val imeInsets = windowInsets.getInsets(WindowInsetsCompat.Type.ime())
 
+            val systemBarsInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout())
+
             val keyboardVisible = imeInsets.bottom > 0
 
             if (keyboardVisible != isKeyboardVisible) {
@@ -701,6 +704,11 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
                 height = if (keyboardVisible) imeInsets.bottom else navInsets.bottom
             }
 
+            binding.contentContainer.updatePadding(
+                left = systemBarsInsets.left,
+                right = systemBarsInsets.right
+            )
+
             windowInsets
         }
     }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt

@@ -140,7 +140,7 @@ class ConversationReactionOverlay : FrameLayout {
 
         // Use your existing utility to handle insets
         applySafeInsetsPaddings(
-            typeMask = WindowInsetsCompat.Type.systemBars(),
+            typeMask = WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout(),
             consumeInsets = false, // Don't consume so children can also access them
             applyTop = false,      // Don't apply as padding, just capture the values
             applyBottom = false
@@ -211,7 +211,17 @@ class ConversationReactionOverlay : FrameLayout {
         val contextMenu = ConversationContextMenu(dropdownAnchor, recipient?.let { getMenuActionItems(messageRecord, it) }.orEmpty())
         this.contextMenu = contextMenu
 
-        var endX = if (isMessageOnLeft) scrubberHorizontalMargin.toFloat() else selectedConversationModel.bubbleX - conversationItem.width + selectedConversationModel.bubbleWidth
+        // Visual left/right edges that account for system insets and configured margin.
+        val leftEdge = (systemInsets.left + scrubberHorizontalMargin).toFloat()
+        val rightEdge = (width - systemInsets.right - scrubberHorizontalMargin).toFloat()
+
+        // Start the bubble aligned to the same visual edge as the scrubber.
+        var endX = if (isMessageOnLeft) {
+            leftEdge
+        } else {
+            rightEdge - conversationItem.width
+        }
+
         var endY = selectedConversationModel.bubbleY - statusBarHeight
         conversationItem.x = endX
         conversationItem.y = endY
@@ -312,13 +322,23 @@ class ConversationReactionOverlay : FrameLayout {
 
         // Adjust for system insets
         reactionBarBackgroundY = maxOf(reactionBarBackgroundY, systemInsets.top.toFloat() - statusBarHeight)
+
+        // Now that endScale is final, clamp the bubble X so it stays fully within the visual edges.
+        val minBubbleX = leftEdge
+        val maxBubbleX = rightEdge
+        endX = endX.coerceIn(minBubbleX, maxBubbleX)
+        // Ensure initial position is corrected before making the overlay visible.
+        conversationItem.x = endX
+        conversationItem.y = endY
+
         hideAnimatorSet.end()
         visibility = VISIBLE
 
+        // Place the scrubber on the same visual edges (accounting for its own width on the right).
         val scrubberX = if (isMessageOnLeft) {
-            scrubberHorizontalMargin.toFloat()
+            leftEdge
         } else {
-            (width - scrubberWidth - scrubberHorizontalMargin).toFloat()
+            (rightEdge - scrubberWidth)
         }
 
         foregroundView.x = scrubberX
@@ -332,22 +352,37 @@ class ConversationReactionOverlay : FrameLayout {
         revealAnimatorSet.start()
 
         if (isWideLayout) {
-            val scrubberRight = scrubberX + scrubberWidth
-            val offsetX = when {
-                isMessageOnLeft -> scrubberRight + menuPadding
-                else -> scrubberX - contextMenu.getMaxWidth() - menuPadding
+            val menuXInOverlay = if (isMessageOnLeft) {
+                // Menu to the RIGHT of the scrubber
+                scrubberX + scrubberWidth + menuPadding
+            } else {
+                // Menu to the LEFT of the scrubber - use MENU width here, not scrubber width
+                scrubberX - contextMenu.getMaxWidth() - menuPadding
             }
-            // Adjust Y position to account for insets
-            val adjustedY = minOf(backgroundView.y, (availableHeight - actualMenuHeight).toFloat()).toInt()
-            contextMenu.show(offsetX.toInt(), adjustedY)
+
+            val maxMenuYInOverlay = (height - systemInsets.bottom - actualMenuHeight).toFloat()
+            val menuYInOverlay = minOf(backgroundView.y, maxMenuYInOverlay)
+
+            // Convert overlay-local to anchor relative as expected by ConversationContextMenu.show()
+            val (xOffset, yOffset) = toAnchorOffsets(menuXInOverlay, menuYInOverlay)
+            contextMenu.show(xOffset, yOffset)
+
         } else {
-            val contentX = if (isMessageOnLeft) scrubberHorizontalMargin.toFloat() else selectedConversationModel.bubbleX
-            val offsetX = when {
-                isMessageOnLeft -> contentX
-                else -> -contextMenu.getMaxWidth() + contentX + bubbleWidth
+            val menuXInOverlay = if (isMessageOnLeft) {
+                leftEdge
+            } else {
+                rightEdge - contextMenu.getMaxWidth()
             }
+
             val menuTop = endApparentTop + conversationItemSnapshot.height * endScale
-            contextMenu.show(offsetX.toInt(), (menuTop + menuPadding).toInt())
+            val menuYInOverlay = (menuTop + menuPadding)
+                .coerceIn(
+                    systemInsets.top.toFloat(),
+                    (height - systemInsets.bottom - actualMenuHeight).toFloat()
+                )
+
+            val (xOffset, yOffset) = toAnchorOffsets(menuXInOverlay, menuYInOverlay)
+            contextMenu.show(xOffset, yOffset)
         }
 
         val revealDuration = context.resources.getInteger(R.integer.reaction_scrubber_reveal_duration)
@@ -361,6 +396,12 @@ class ConversationReactionOverlay : FrameLayout {
             .setDuration(revealDuration.toLong())
     }
 
+    private fun toAnchorOffsets(xInOverlay: Float, yInOverlay: Float): Pair<Int, Int> {
+        val xOffset = (xInOverlay - dropdownAnchor.x).toInt()
+        val yOffset = (yInOverlay - dropdownAnchor.y).toInt()
+        return xOffset to yOffset
+    }
+
     private fun getReactionBarOffsetForTouch(itemY: Float,
                                              contextMenuTop: Float,
                                              contextMenuPadding: Float,