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

Revert "Temporary remove setting for automatically jump to commands tab to prevent crash"

Browse source 
This reverts commit 648c8d9cfe.
This commit is contained in:
Arne 2024-10-13 19:42:47 +02:00
parent 648c8d9cfe
commit e99c28a261
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/entities/Conversation.java
View file

@ -1712,11 +1712,15 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
}
public int getCurrentTab() {
if (mCurrentTab >= 0) return mCurrentTab;
if (xmppConnectionService != null && xmppConnectionService.getBooleanPreference("jump_to_commands_tab", R.bool.jump_to_commands_tab)) {
if (mCurrentTab >= 0) return mCurrentTab;
if (!isRead(null) || getContact().resourceWhichSupport(Namespace.COMMANDS) == null) {
return 0;
}
return 1;
return 1;
} else return 0;
}
public void refreshSessions() {

2
src/main/res/xml/preferences_interface.xml
View file

@ -198,14 +198,12 @@
android:key="follow_thread_in_channel"
android:summary="@string/pref_follow_thread_in_channel_summary"
android:title="@string/pref_follow_thread_in_channel" />
<!--
<SwitchPreferenceCompat
android:defaultValue="@bool/jump_to_commands_tab"
android:icon="@drawable/ic_open_with_24dp"
android:key="jump_to_commands_tab"
android:summary="@string/pref_jump_to_commands_tab_summary"
android:title="@string/pref_jump_to_commands_tab" />
-->
<SwitchPreferenceCompat
android:icon="@drawable/ic_mood_24dp"
android:defaultValue="@bool/message_autocomplete"