TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 20:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash

Browse Source
This commit is contained in:
Niels Andriesse 2021-06-29 13:48:46 +10:00
parent d38b81f222
commit 1133cf45c3
2 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
View File

@ -167,7 +167,7 @@ object ConversationMenuHelper {
val group = DatabaseFactory.getGroupDatabase(context).getGroup(thread.address.toGroupString()).orNull() val group = DatabaseFactory.getGroupDatabase(context).getGroup(thread.address.toGroupString()).orNull()
if (group?.isActive == false) { return } if (group?.isActive == false) { return }
} }
ExpirationDialog.show(context, thread.expireMessages, ExpirationDialog.OnClickListener { expirationTime: Int -> ExpirationDialog.show(context, thread.expireMessages) { expirationTime: Int ->
DatabaseFactory.getRecipientDatabase(context).setExpireMessages(thread, expirationTime) DatabaseFactory.getRecipientDatabase(context).setExpireMessages(thread, expirationTime)
val message = ExpirationTimerUpdate(expirationTime) val message = ExpirationTimerUpdate(expirationTime)
message.recipient = thread.address.serialize() message.recipient = thread.address.serialize()
@ -177,7 +177,7 @@ object ConversationMenuHelper {
MessageSender.send(message, thread.address) MessageSender.send(message, thread.address)
val activity = context as AppCompatActivity val activity = context as AppCompatActivity
activity.invalidateOptionsMenu() activity.invalidateOptionsMenu()
}) }
} }
private fun unblock(context: Context, thread: Recipient) { private fun unblock(context: Context, thread: Recipient) {

11
app/src/main/res/layout/expiration_dialog.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical" android:orientation="vertical"
@ -13,8 +14,8 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
app:npv_WrapSelectorWheel="false" app:npv_WrapSelectorWheel="false"
app:npv_DividerColor="#cbc8ea" app:npv_DividerColor="#cbc8ea"
app:npv_TextColorNormal="?conversation_number_picker_text_color_normal" app:npv_TextColorNormal="@color/text"
app:npv_TextColorSelected="?conversation_number_picker_text_color_selected" app:npv_TextColorSelected="@color/text"
app:npv_ItemPaddingVertical="20dp" app:npv_ItemPaddingVertical="20dp"
app:npv_TextColorHint="@color/grey_600" app:npv_TextColorHint="@color/grey_600"
app:npv_TextSizeNormal="16sp" app:npv_TextSizeNormal="16sp"
@ -22,7 +23,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextView android:id="@+id/expiration_details" <TextView
android:id="@+id/expiration_details"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/expiration_number_picker" android:layout_below="@id/expiration_number_picker"
@ -30,5 +32,4 @@
android:padding="20dp" android:padding="20dp"
tools:text="Your messages will not expire."/> tools:text="Your messages will not expire."/>
</RelativeLayout> </RelativeLayout>