thedevstack/PiratX-Archive
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed adding omemo encrypted images to gallery

Browse source
This commit is contained in:
Christian Schneppe 2020-01-24 20:20:37 +01:00
parent 67f244555c
commit 6ff2ae4e02
No known key found for this signature in database
GPG key ID: F30B8D686B44D87E
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -3,6 +3,9 @@
#### Version 2.3.5
* start removing OTR
* rework conference and contact details (big avatar is available via long click)
* resume download of OMEMO encrypted files
* Channels now use '#' as symbol in avatar
* bug fixes
#### Version 2.3.4
* fixes for Jingle IBB file transfer

16
build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.2'
classpath 'com.android.tools.build:gradle:3.5.3'
}
}
@ -63,7 +63,7 @@ dependencies {
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.exifinterface:exifinterface:1.0.0'
implementation 'androidx.exifinterface:exifinterface:1.1.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.emoji:emoji:1.0.0'
gitImplementation 'androidx.emoji:emoji-appcompat:1.0.0'
@ -84,8 +84,8 @@ dependencies {
implementation 'com.leinardi.android:speed-dial:3.1.1' // version >= 3.0.0 needs android X libraries
implementation 'com.squareup.picasso:picasso:2.71828'
implementation 'com.squareup.okhttp3:okhttp:3.12.6' // versions > 3.12.x don't support API level < 21 anymore
implementation 'com.squareup.retrofit2:retrofit:2.6.2'
implementation 'com.squareup.retrofit2:converter-gson:2.6.2'
implementation "com.squareup.retrofit2:retrofit:2.6.4" //retrofit needs to stick with 2.6.x (https://github.com/square/retrofit/blob/master/CHANGELOG.md)
implementation "com.squareup.retrofit2:converter-gson:2.6.4"
implementation 'com.google.guava:guava:28.1-android'
implementation('com.github.AppIntro:AppIntro:5.1.0') {
exclude group: 'org.jetbrains' , module:'annotations'
@ -105,12 +105,12 @@ android {
minSdkVersion 16
targetSdkVersion 29
versionCode 281
versionName "2.3.4"
versionCode 282
versionName "2.3.5-beta (2020-01-02)"
//resConfigs "en"
archivesBaseName += "-$versionName"
applicationId "de.pixart.messenger"
applicationId "de.pixart.messenger.test"
multiDexEnabled true
buildConfigField("String", "LOGTAG", '"Pix-Art_Messenger"')
@ -119,7 +119,7 @@ android {
buildConfigField("boolean", "SHOW_INTRO", 'true')
buildConfigField("String", "UPDATE_URL", '"https://xmpp.pix-art.de/Pix-Art_Messenger/update/"')
resValue "string", "applicationId", applicationId
resValue "string", "app_name", "Pix-Art Messenger"
resValue "string", "app_name", "Pix-Art Messenger Test"
}
dataBinding {

3
src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java
View file

@ -193,7 +193,7 @@ public class HttpDownloadConnection implements Transferable {
}
}
private void finish() throws Exception {
private void finish() {
message.setTransferable(null);
mHttpConnectionManager.finishConnection(this);
boolean notify = acceptedAutomatically && !message.isRead();
@ -202,6 +202,7 @@ public class HttpDownloadConnection implements Transferable {
}
mHttpConnectionManager.updateConversationUi(true);
final boolean notifyAfterScan = notify;
final DownloadableFile file = mXmppConnectionService.getFileBackend().getFile(message, true);
mXmppConnectionService.getFileBackend().updateMediaScanner(file, () -> {
if (notifyAfterScan) {
mXmppConnectionService.getNotificationService().push(message);