Setting to enable commands view step 2

This commit is contained in:
12aw 2023-11-27 20:00:17 +01:00
parent 6c91b340ef
commit 5cfd0b6e3c
2 changed files with 25 additions and 18 deletions

View file

@ -20,13 +20,13 @@
"filters": [ "filters": [
{ {
"filterType": "ABI", "filterType": "ABI",
"value": "x86_64" "value": "x86"
} }
], ],
"attributes": [], "attributes": [],
"versionCode": 15003, "versionCode": 15002,
"versionName": "1.7.7.5", "versionName": "1.7.7.5",
"outputFile": "monocles chat-1.7.7.5-git-x86_64-release.apk" "outputFile": "monocles chat-1.7.7.5-git-x86-release.apk"
}, },
{ {
"type": "ONE_OF_MANY", "type": "ONE_OF_MANY",
@ -41,19 +41,6 @@
"versionName": "1.7.7.5", "versionName": "1.7.7.5",
"outputFile": "monocles chat-1.7.7.5-git-arm64-v8a-release.apk" "outputFile": "monocles chat-1.7.7.5-git-arm64-v8a-release.apk"
}, },
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "x86"
}
],
"attributes": [],
"versionCode": 15002,
"versionName": "1.7.7.5",
"outputFile": "monocles chat-1.7.7.5-git-x86-release.apk"
},
{ {
"type": "ONE_OF_MANY", "type": "ONE_OF_MANY",
"filters": [ "filters": [
@ -66,6 +53,19 @@
"versionCode": 15001, "versionCode": 15001,
"versionName": "1.7.7.5", "versionName": "1.7.7.5",
"outputFile": "monocles chat-1.7.7.5-git-armeabi-v7a-release.apk" "outputFile": "monocles chat-1.7.7.5-git-armeabi-v7a-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "x86_64"
}
],
"attributes": [],
"versionCode": 15003,
"versionName": "1.7.7.5",
"outputFile": "monocles chat-1.7.7.5-git-x86_64-release.apk"
} }
], ],
"elementType": "File" "elementType": "File"

View file

@ -3559,10 +3559,17 @@ if (activity!=null && activity.xmppConnectionService.getBooleanPreference("show
refreshCommands(false); refreshCommands(false);
} }
} else { } else {
binding.commandsViewProgressbar.setVisibility(GONE); if (commandAdapter != null && conversation != originalConversation) {
commandAdapter = null;
conversation.setupViewPager(binding.conversationViewPager, binding.tabLayout, false, originalConversation);
refreshCommands(false);
}
if (commandAdapter == null && conversation != null) {
commandAdapter = null;
conversation.setupViewPager(binding.conversationViewPager, binding.tabLayout, false, null); conversation.setupViewPager(binding.conversationViewPager, binding.tabLayout, false, null);
binding.commandsView.setAdapter(null); binding.commandsView.setAdapter(null);
refreshCommands(false); refreshCommands(false);
}
} }
return true; return true;
} }