From 3b26948a9de97c9e735a1c175640fed9e024da2b Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 23 Jun 2023 18:00:58 +0200 Subject: [PATCH] replace libraries hosted on jcenter --- build.gradle | 11 +++++++---- src/main/AndroidManifest.xml | 2 +- .../java/eu/siacs/conversations/crypto/PgpEngine.java | 4 +++- .../ui/PublishGroupChatProfilePictureActivity.java | 4 ++-- .../ui/PublishProfilePictureActivity.java | 2 +- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index d1b21e3f5..44e352367 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ apply plugin: 'com.android.application' repositories { google() mavenCentral() - jcenter() + maven { url='https://jitpack.io'} } configurations { @@ -40,8 +40,8 @@ dependencies { } conversationsPlaystoreImplementation("com.android.installreferrer:installreferrer:2.2") quicksyPlaystoreImplementation 'com.google.android.gms:play-services-auth-api-phone:18.0.1' - implementation 'org.sufficientlysecure:openpgp-api:10.0' - implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' + implementation 'com.github.open-keychain.open-keychain:openpgp-api:v5.7.1' + implementation("com.github.CanHub:Android-Image-Cropper:2.0.0") implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.exifinterface:exifinterface:1.3.6' implementation 'androidx.cardview:cardview:1.0.0' @@ -61,7 +61,10 @@ dependencies { implementation 'com.makeramen:roundedimageview:2.3.0' implementation "com.wefika:flowlayout:0.4.1" //noinspection GradleDependency - implementation 'com.otaliastudios:transcoder:0.9.1' + implementation('com.github.natario1:Transcoder:v0.9.1') { + exclude group: 'com.otaliastudios.opengl', module: 'egloo' + } + implementation 'com.github.natario1:Egloo:v0.4.0' implementation 'org.jxmpp:jxmpp-jid:1.0.3' implementation 'org.osmdroid:osmdroid-android:6.1.11' diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index e1fe934af..806232a22 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -298,7 +298,7 @@ android:value="eu.siacs.conversations.ui.SettingsActivity" /> diff --git a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java index 9652ad3eb..d3588a995 100644 --- a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java +++ b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java @@ -285,7 +285,9 @@ public class PgpEngine { Intent params = new Intent(); params.setAction(OpenPgpApi.ACTION_GET_KEY); params.putExtra(OpenPgpApi.EXTRA_KEY_ID, pgpKeyId); - Intent result = api.executeApi(params, null, null); + final ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + final ByteArrayInputStream inputStream = new ByteArrayInputStream(new byte[0]); + Intent result = api.executeApi(params, inputStream, outputStream); return (PendingIntent) result.getParcelableExtra(OpenPgpApi.RESULT_INTENT); } } diff --git a/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java index 81b0ae15c..658567aa6 100644 --- a/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java @@ -40,8 +40,6 @@ import android.widget.Toast; import androidx.annotation.StringRes; import androidx.databinding.DataBindingUtil; -import com.theartofdev.edmodo.cropper.CropImage; - import eu.siacs.conversations.Config; import eu.siacs.conversations.R; import eu.siacs.conversations.databinding.ActivityPublishProfilePictureBinding; @@ -51,6 +49,8 @@ import eu.siacs.conversations.ui.util.PendingItem; import static eu.siacs.conversations.ui.PublishProfilePictureActivity.REQUEST_CHOOSE_PICTURE; +import com.canhub.cropper.CropImage; + public class PublishGroupChatProfilePictureActivity extends XmppActivity implements OnAvatarPublication { private final PendingItem pendingConversationUuid = new PendingItem<>(); private ActivityPublishProfilePictureBinding binding; diff --git a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java index 16607b81e..b6822b301 100644 --- a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java @@ -19,7 +19,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.StringRes; -import com.theartofdev.edmodo.cropper.CropImage; +import com.canhub.cropper.CropImage; import java.util.concurrent.atomic.AtomicBoolean;