narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

replace libraries hosted on jcenter

Browse source
This commit is contained in:
Daniel Gultsch 2023-06-23 18:00:58 +02:00
parent 6289e048b3
commit 3b26948a9d
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
5 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
build.gradle
View file

@ -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'

2
src/main/AndroidManifest.xml
View file

@ -298,7 +298,7 @@
android:value="eu.siacs.conversations.ui.SettingsActivity" />
</activity>
<activity
android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
android:name="com.canhub.cropper.CropImageActivity"
android:theme="@style/Base.Theme.AppCompat" />
<activity android:name=".ui.MemorizingActivity" />

4
src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
View file

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

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

@ -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<String> pendingConversationUuid = new PendingItem<>();
private ActivityPublishProfilePictureBinding binding;

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

@ -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;