mirror of
https://github.com/oxen-io/session-android.git
synced 2025-02-19 21:08:26 +00:00
Merge branch 'release/1.19.0' into fix-send-seed-dialog
This commit is contained in:
commit
1a3ffe1a8c
@ -125,7 +125,7 @@
|
||||
<activity
|
||||
android:name="org.thoughtcrime.securesms.home.HomeActivity"
|
||||
android:screenOrientation="portrait"
|
||||
android:launchMode="standard"
|
||||
android:launchMode="singleTask"
|
||||
android:theme="@style/Theme.Session.DayNight.NoActionBar" />
|
||||
<activity
|
||||
android:name="org.thoughtcrime.securesms.messagerequests.MessageRequestsActivity"
|
||||
|
@ -46,7 +46,7 @@ internal class NewMessageViewModel @Inject constructor(
|
||||
}
|
||||
|
||||
override fun onContinue() {
|
||||
val idOrONS = state.value.newMessageIdOrOns
|
||||
val idOrONS = state.value.newMessageIdOrOns.trim()
|
||||
|
||||
if (PublicKeyValidation.isValid(idOrONS, isPrefixRequired = false)) {
|
||||
onUnvalidatedPublicKey(publicKey = idOrONS)
|
||||
|
@ -142,8 +142,6 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
|
||||
override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
|
||||
super.onCreate(savedInstanceState, isReady)
|
||||
|
||||
if (!isTaskRoot) { finish(); return }
|
||||
|
||||
// Set content view
|
||||
binding = ActivityHomeBinding.inflate(layoutInflater)
|
||||
setContentView(binding.root)
|
||||
|
Loading…
x
Reference in New Issue
Block a user