mirror/monocles_chat
1
0
Fork 1
mirror of https://codeberg.org/monocles/monocles_chat.git synced 2025-01-16 06:32:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Stop voice recorder when leaving chat + fix crash when back pressed after screen rotated

Browse source
This commit is contained in:
12aw 2024-01-25 09:26:22 +01:00
parent 23a9fd9a24
commit da9d614bdd
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -896,6 +896,21 @@ public class ConversationFragment extends XmppFragment
}
};
private final OnBackPressedCallback backPressedLeaveVoiceRecorder = new OnBackPressedCallback(false) {
@Override
public void handleOnBackPressed() {
if (binding.recordingVoiceActivity.getVisibility()==VISIBLE){
mHandler.removeCallbacks(mTickExecutor);
stopRecording(false);
activity.setResult(RESULT_CANCELED);
//activity.finish();
binding.recordingVoiceActivity.setVisibility(View.GONE);
}
this.setEnabled(false);
refresh();
}
};
private int completionIndex = 0;
private int lastCompletionLength = 0;
@ -1577,6 +1592,7 @@ public class ConversationFragment extends XmppFragment
oldOrientation = activity.getRequestedOrientation();
activity.getOnBackPressedDispatcher().addCallback(this, backPressedLeaveSingleThread);
activity.getOnBackPressedDispatcher().addCallback(this, backPressedLeaveEmojiPicker);
activity.getOnBackPressedDispatcher().addCallback(this, backPressedLeaveVoiceRecorder);
}
@Override
@ -2436,7 +2452,15 @@ public class ConversationFragment extends XmppFragment
if (binding.emojiPicker.getVisibility()==VISIBLE){
binding.emojiPicker.setVisibility(GONE);
hideSoftKeyboard(activity);
return true;
return false;
}
if (binding.recordingVoiceActivity.getVisibility()==VISIBLE){
mHandler.removeCallbacks(mTickExecutor);
stopRecording(false);
activity.setResult(RESULT_CANCELED);
//activity.finish();
binding.recordingVoiceActivity.setVisibility(View.GONE);
return false;
}
return false;
}
@ -3078,6 +3102,7 @@ public class ConversationFragment extends XmppFragment
intent.setAction(Intent.ACTION_GET_CONTENT);
break;
case ATTACHMENT_CHOICE_RECORD_VOICE:
backPressedLeaveVoiceRecorder.setEnabled(true);
recordVoice();
break;
case ATTACHMENT_CHOICE_LOCATION:
@ -3354,7 +3379,7 @@ public class ConversationFragment extends XmppFragment
}
if (!activity.xmppConnectionService.getBooleanPreference("show_thread_feature", R.bool.show_thread_feature)) return;
}
if (activity != null && activity.xmppConnectionService.getBooleanPreference("show_thread_feature", R.bool.show_thread_feature)) {
if (activity != null && activity.xmppConnectionService != null && activity.xmppConnectionService.getBooleanPreference("show_thread_feature", R.bool.show_thread_feature)) {
setThread(message.getThread());
}
}

2
src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
View file

@ -1295,7 +1295,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
@Override
public void onConversationRead(Conversation conversation, String upToUuid) {
if (!mActivityPaused && pendingViewIntent.peek() == null) {
if (xmppConnectionService != null && !mActivityPaused && pendingViewIntent.peek() == null) {
xmppConnectionService.sendReadMarker(conversation, upToUuid);
} else {
Log.d(Config.LOGTAG, "ignoring read callback. mActivityPaused=" + Boolean.toString(mActivityPaused));