mirror of
https://codeberg.org/monocles/monocles_chat.git
synced 2025-01-27 15:34:14 +01:00
Fix crash after photo editor
This commit is contained in:
parent
5e89991f0a
commit
4f6231d1bb
2 changed files with 3 additions and 3 deletions
|
@ -61,7 +61,7 @@ dependencies {
|
||||||
}
|
}
|
||||||
playstoreImplementation 'com.android.installreferrer:installreferrer:2.2'
|
playstoreImplementation 'com.android.installreferrer:installreferrer:2.2'
|
||||||
implementation 'com.github.open-keychain.open-keychain:openpgp-api:v5.7.1'
|
implementation 'com.github.open-keychain.open-keychain:openpgp-api:v5.7.1'
|
||||||
implementation("com.github.CanHub:Android-Image-Cropper:2.0.0")
|
implementation("com.github.CanHub:Android-Image-Cropper:2.2.0")
|
||||||
implementation 'im.conversations.webrtc:webrtc-android:119.0.1'
|
implementation 'im.conversations.webrtc:webrtc-android:119.0.1'
|
||||||
implementation 'org.jitsi:org.otr4j:0.23'
|
implementation 'org.jitsi:org.otr4j:0.23'
|
||||||
implementation 'org.bouncycastle:bcmail-jdk18on:1.78.1'
|
implementation 'org.bouncycastle:bcmail-jdk18on:1.78.1'
|
||||||
|
|
|
@ -3742,9 +3742,9 @@ public class ConversationFragment extends XmppFragment
|
||||||
@Override
|
@Override
|
||||||
public void onResume() {
|
public void onResume() {
|
||||||
super.onResume();
|
super.onResume();
|
||||||
updateChatBG();
|
|
||||||
disableEncrpytionForExceptions();
|
disableEncrpytionForExceptions();
|
||||||
binding.messagesView.post(this::fireReadEvent);
|
binding.messagesView.post(this::fireReadEvent);
|
||||||
|
updateChatBG();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void disableEncrpytionForExceptions() {
|
private void disableEncrpytionForExceptions() {
|
||||||
|
@ -4309,7 +4309,6 @@ public class ConversationFragment extends XmppFragment
|
||||||
@Override
|
@Override
|
||||||
public void onStart() {
|
public void onStart() {
|
||||||
super.onStart();
|
super.onStart();
|
||||||
updateChatBG();
|
|
||||||
disableEncrpytionForExceptions();
|
disableEncrpytionForExceptions();
|
||||||
if (this.reInitRequiredOnStart && this.conversation != null) {
|
if (this.reInitRequiredOnStart && this.conversation != null) {
|
||||||
final Bundle extras = pendingExtras.pop();
|
final Bundle extras = pendingExtras.pop();
|
||||||
|
@ -4324,6 +4323,7 @@ public class ConversationFragment extends XmppFragment
|
||||||
findAndReInitByUuidOrArchive(uuid);
|
findAndReInitByUuidOrArchive(uuid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
updateChatBG();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Add table
Reference in a new issue