thedevstack/PiratX
2
0
Fork 0
forked from mirror/monocles_chat_clean
Code Issues 5 Pull requests 1 Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Arne 2024-10-13 18:25:05 +02:00
parent b7a6f36f1d
commit 1f2c880b82
2 changed files with 4 additions and 6 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,15 +1712,11 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
} }
public int getCurrentTab() { public int getCurrentTab() {
if (xmppConnectionService != null && xmppConnectionService.getBooleanPreference("jump_to_commands_tab", R.bool.jump_to_commands_tab)) { if (mCurrentTab >= 0) return mCurrentTab;
if (mCurrentTab >= 0) return mCurrentTab;
if (!isRead(null) || getContact().resourceWhichSupport(Namespace.COMMANDS) == null) { if (!isRead(null) || getContact().resourceWhichSupport(Namespace.COMMANDS) == null) {
return 0; return 0;
} }
return 1;
return 1;
} else return 0;
} }
public void refreshSessions() { public void refreshSessions() {

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

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