mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

reactivate allow merge messages + refractor

Browse source
This commit is contained in:
Arne 2023-01-13 16:03:24 +01:00
parent ac0690453d
commit 557619bad0
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build.gradle
View file

@ -107,23 +107,23 @@ android {
minSdkVersion 21
targetSdkVersion 32
versionNameSuffix " beta_(2023-01-10)" // " beta_(XXXX-XX-XX)" // activate for beta versions
//versionNameSuffix " beta_(2023-01-10)" // " beta_(XXXX-XX-XX)" // activate for beta versions
versionCode 127
versionName "1.5.16"
//resConfigs "en"
archivesBaseName += "-$versionName"
archivesBaseName += "$versionNameSuffix" // activate for beta versions
applicationId "de.monocles.chat.beta"
//archivesBaseName += "$versionNameSuffix" // activate for beta versions
applicationId "de.monocles.chat"
multiDexEnabled true
buildConfigField("String", "LOGTAG", '"monocles chat beta"')
buildConfigField("String", "LOGTAG", '"monocles chat"')
buildConfigField("String", "DOMAIN_LOCK", 'null')
buildConfigField("boolean", "SHOW_INTRO", 'true')
buildConfigField("String", "UPDATE_URL", '"https://monocles.eu/chat/update/"')
resValue "string", "applicationId", applicationId
resValue "string", "app_name", "monocles chat beta"
resValue "string", "short_app_name", "chat beta"
resValue "string", "app_name", "monocles chat"
resValue "string", "short_app_name", "chat"
}

6
src/main/res/xml/preferences.xml
View file

@ -107,12 +107,11 @@
android:key="start_searching"
android:summary="@string/pref_start_search_summary"
android:title="@string/pref_start_search" />
<!-- disabled since commit e0de9d467244cc36dff88bb65d009db9d4349f33 -->
<!--<CheckBoxPreference
<CheckBoxPreference
android:defaultValue="@bool/allowmergemessages"
android:key="allowmergemessages"
android:summary="@string/pref_allowmergemessages_sum"
android:title="@string/pref_allowmergemessages" />-->
android:title="@string/pref_allowmergemessages" />
<CheckBoxPreference
android:defaultValue="@bool/showtextformatting"
android:key="showtextformatting"
@ -513,7 +512,6 @@
android:key="up_push_server"
android:summary="@string/pref_up_push_server_summary"
android:title="@string/pref_up_push_server_title" />
</PreferenceCategory>
<PreferenceCategory