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

Revert "prepare 1.7.6.3 code 140 + code clean up"

Browse source 
This reverts commit a72161cd30.
This commit is contained in:
Arne 2023-10-25 16:06:07 +02:00
parent a72161cd30
commit a1e68b2f35
4 changed files with 45 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build.gradle
View file

@ -127,9 +127,11 @@ dependencies {
implementation 'com.tbuonomo:dotsindicator:4.2'
implementation 'me.xdrop:fuzzywuzzy:1.4.0'
implementation "com.daimajia.swipelayout:library:1.2.0@aar"
implementation 'com.daimajia.androidanimations:library:1.1.2@aar'
implementation 'com.nineoldandroids:library:2.4.0'
implementation 'jp.wasabeef:recyclerview-animators:1.0.3@aar'
implementation "androidx.core:core-ktx:1.12.0"
implementation 'com.github.bumptech.glide:glide:4.16.0'
implementation "androidx.emoji2:emoji2-emojipicker:1.4.0"
implementation "androidx.compose.material3:material3-android:1.2.0-alpha10"
}
@ -153,8 +155,8 @@ android {
targetSdkVersion 34
// versionNameSuffix " Experimental_(2023-10-24)" // " beta_(XXXX-XX-XX)" // activate for beta versions
versionCode 140
versionName "1.7.6.3"
versionCode 139
versionName "1.7.6.2"
//resConfigs "en"
archivesBaseName += "-$versionName"

70
git/release/output-metadata.json
View file

@ -11,22 +11,9 @@
"type": "UNIVERSAL",
"filters": [],
"attributes": [],
"versionCode": 16504,
"versionName": "1.7.6.2",
"outputFile": "monocles chat-1.7.6.2-git-universal-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "arm64-v8a"
}
],
"attributes": [],
"versionCode": 13904,
"versionName": "1.7.6.2",
"outputFile": "monocles chat-1.7.6.2-git-arm64-v8a-release.apk"
"versionCode": 138,
"versionName": "4135a60",
"outputFile": "monocles chat-1.7.6-git-universal-release.apk"
},
{
"type": "ONE_OF_MANY",
@ -37,22 +24,9 @@
}
],
"attributes": [],
"versionCode": 13902,
"versionName": "1.7.6.2",
"outputFile": "monocles chat-1.7.6.2-git-x86-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "x86_64"
}
],
"attributes": [],
"versionCode": 13903,
"versionName": "1.7.6.2",
"outputFile": "monocles chat-1.7.6.2-git-x86_64-release.apk"
"versionCode": 13802,
"versionName": "4135a60",
"outputFile": "monocles chat-1.7.6-git-x86-release.apk"
},
{
"type": "ONE_OF_MANY",
@ -63,9 +37,35 @@
}
],
"attributes": [],
"versionCode": 13901,
"versionName": "1.7.6.2",
"outputFile": "monocles chat-1.7.6.2-git-armeabi-v7a-release.apk"
"versionCode": 13801,
"versionName": "4135a60",
"outputFile": "monocles chat-1.7.6-git-armeabi-v7a-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "arm64-v8a"
}
],
"attributes": [],
"versionCode": 13804,
"versionName": "4135a60",
"outputFile": "monocles chat-1.7.6-git-arm64-v8a-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "x86_64"
}
],
"attributes": [],
"versionCode": 13803,
"versionName": "4135a60",
"outputFile": "monocles chat-1.7.6-git-x86_64-release.apk"
}
],
"elementType": "File"

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

@ -23,6 +23,10 @@ import static eu.siacs.conversations.utils.PermissionUtils.readGranted;
import static eu.siacs.conversations.utils.StorageHelper.getConversationsDirectory;
import static eu.siacs.conversations.xmpp.Patches.ENCRYPTION_EXCEPTIONS;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.transition.Transition;
import com.google.common.collect.ImmutableList;
import static eu.siacs.conversations.utils.CameraUtils.getCameraApp;
import static eu.siacs.conversations.utils.CameraUtils.showCameraChooser;

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

@ -79,6 +79,8 @@ import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.content.res.ResourcesCompat;
import com.daimajia.swipe.SwipeLayout;
import com.daimajia.androidanimations.library.Techniques;
import com.daimajia.androidanimations.library.YoYo;
import com.google.common.base.Strings;
import com.squareup.picasso.Picasso;
import com.lelloman.identicon.view.GithubIdenticonView;