remove jcenter + update dependencies

This commit is contained in:
Arne 2024-08-21 14:56:13 +02:00
parent 94790f2779
commit a74b14d057
5 changed files with 14 additions and 12 deletions

View file

@ -32,7 +32,6 @@ repositories {
google()
mavenCentral()
maven { url "https://jitpack.io" }
jcenter()
}
configurations {
@ -60,11 +59,8 @@ dependencies {
exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
}
playstoreImplementation 'com.android.installreferrer:installreferrer:2.2'
implementation 'org.sufficientlysecure:openpgp-api:10.0'
implementation('com.theartofdev.edmodo:android-image-cropper:2.8.0') {
exclude group: 'com.android.support', module: 'appcompat-v7'
exclude group: 'com.android.support', module: 'exifinterface'
}
implementation 'com.github.open-keychain.open-keychain:openpgp-api:v5.7.1'
implementation("com.github.CanHub:Android-Image-Cropper:2.0.0")
implementation 'im.conversations.webrtc:webrtc-android:119.0.1'
implementation 'org.jitsi:org.otr4j:0.23'
implementation 'org.bouncycastle:bcmail-jdk18on:1.78.1'
@ -73,7 +69,6 @@ dependencies {
implementation 'org.minidns:minidns-hla:1.0.5'
implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
implementation 'org.whispersystems:signal-protocol-android:2.6.2'
implementation 'jetty:javax.servlet:5.1.12'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
@ -106,7 +101,11 @@ dependencies {
implementation 'com.google.guava:guava:32.1.3-android'
implementation 'com.github.AppIntro:AppIntro:6.2.0'
implementation 'androidx.browser:browser:1.8.0'
implementation 'com.otaliastudios:transcoder:0.9.1' // 0.10.4 seems to be buggy
//noinspection GradleDependency
implementation('com.github.natario1:Transcoder:v0.9.1') {
exclude group: 'com.otaliastudios.opengl', module: 'egloo'
}
implementation 'com.github.natario1:Egloo:v0.4.0'
implementation 'com.github.singpolyma:Better-Link-Movement-Method:4df081e1e4'
implementation project(':libs:AXML')
implementation 'com.github.ipld:java-cid:v1.3.1'

View file

@ -556,7 +556,7 @@
</intent-filter>
</activity>
<activity
android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
android:name="com.canhub.cropper.CropImageActivity"
android:launchMode="singleTask"
android:exported="false"
android:theme="@style/Base.Theme.MaterialComponents" />

View file

@ -284,7 +284,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);
}
}

View file

@ -44,7 +44,7 @@ import androidx.appcompat.widget.Toolbar;
import androidx.databinding.DataBindingUtil;
import android.os.Build;
import com.theartofdev.edmodo.cropper.CropImage;
import com.canhub.cropper.CropImage;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.R;
@ -124,6 +124,7 @@ public class PublishGroupChatProfilePictureActivity extends XmppActivity impleme
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE) {
final CropImage.ActivityResult result = CropImage.getActivityResult(data);
if (resultCode == RESULT_OK) {

View file

@ -21,7 +21,7 @@ import android.graphics.drawable.AnimatedImageDrawable;
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;