replace libraries hosted on jcenter
This commit is contained in:
parent
6289e048b3
commit
3b26948a9d
11
build.gradle
11
build.gradle
|
@ -15,7 +15,7 @@ apply plugin: 'com.android.application'
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
jcenter()
|
maven { url='https://jitpack.io'}
|
||||||
}
|
}
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
|
@ -40,8 +40,8 @@ dependencies {
|
||||||
}
|
}
|
||||||
conversationsPlaystoreImplementation("com.android.installreferrer:installreferrer:2.2")
|
conversationsPlaystoreImplementation("com.android.installreferrer:installreferrer:2.2")
|
||||||
quicksyPlaystoreImplementation 'com.google.android.gms:play-services-auth-api-phone:18.0.1'
|
quicksyPlaystoreImplementation 'com.google.android.gms:play-services-auth-api-phone:18.0.1'
|
||||||
implementation 'org.sufficientlysecure:openpgp-api:10.0'
|
implementation 'com.github.open-keychain.open-keychain:openpgp-api:v5.7.1'
|
||||||
implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
|
implementation("com.github.CanHub:Android-Image-Cropper:2.0.0")
|
||||||
implementation 'androidx.appcompat:appcompat:1.6.1'
|
implementation 'androidx.appcompat:appcompat:1.6.1'
|
||||||
implementation 'androidx.exifinterface:exifinterface:1.3.6'
|
implementation 'androidx.exifinterface:exifinterface:1.3.6'
|
||||||
implementation 'androidx.cardview:cardview:1.0.0'
|
implementation 'androidx.cardview:cardview:1.0.0'
|
||||||
|
@ -61,7 +61,10 @@ dependencies {
|
||||||
implementation 'com.makeramen:roundedimageview:2.3.0'
|
implementation 'com.makeramen:roundedimageview:2.3.0'
|
||||||
implementation "com.wefika:flowlayout:0.4.1"
|
implementation "com.wefika:flowlayout:0.4.1"
|
||||||
//noinspection GradleDependency
|
//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.jxmpp:jxmpp-jid:1.0.3'
|
||||||
implementation 'org.osmdroid:osmdroid-android:6.1.11'
|
implementation 'org.osmdroid:osmdroid-android:6.1.11'
|
||||||
|
|
|
@ -298,7 +298,7 @@
|
||||||
android:value="eu.siacs.conversations.ui.SettingsActivity" />
|
android:value="eu.siacs.conversations.ui.SettingsActivity" />
|
||||||
</activity>
|
</activity>
|
||||||
<activity
|
<activity
|
||||||
android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
|
android:name="com.canhub.cropper.CropImageActivity"
|
||||||
android:theme="@style/Base.Theme.AppCompat" />
|
android:theme="@style/Base.Theme.AppCompat" />
|
||||||
<activity android:name=".ui.MemorizingActivity" />
|
<activity android:name=".ui.MemorizingActivity" />
|
||||||
|
|
||||||
|
|
|
@ -285,7 +285,9 @@ public class PgpEngine {
|
||||||
Intent params = new Intent();
|
Intent params = new Intent();
|
||||||
params.setAction(OpenPgpApi.ACTION_GET_KEY);
|
params.setAction(OpenPgpApi.ACTION_GET_KEY);
|
||||||
params.putExtra(OpenPgpApi.EXTRA_KEY_ID, pgpKeyId);
|
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);
|
return (PendingIntent) result.getParcelableExtra(OpenPgpApi.RESULT_INTENT);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,8 +40,6 @@ import android.widget.Toast;
|
||||||
import androidx.annotation.StringRes;
|
import androidx.annotation.StringRes;
|
||||||
import androidx.databinding.DataBindingUtil;
|
import androidx.databinding.DataBindingUtil;
|
||||||
|
|
||||||
import com.theartofdev.edmodo.cropper.CropImage;
|
|
||||||
|
|
||||||
import eu.siacs.conversations.Config;
|
import eu.siacs.conversations.Config;
|
||||||
import eu.siacs.conversations.R;
|
import eu.siacs.conversations.R;
|
||||||
import eu.siacs.conversations.databinding.ActivityPublishProfilePictureBinding;
|
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 static eu.siacs.conversations.ui.PublishProfilePictureActivity.REQUEST_CHOOSE_PICTURE;
|
||||||
|
|
||||||
|
import com.canhub.cropper.CropImage;
|
||||||
|
|
||||||
public class PublishGroupChatProfilePictureActivity extends XmppActivity implements OnAvatarPublication {
|
public class PublishGroupChatProfilePictureActivity extends XmppActivity implements OnAvatarPublication {
|
||||||
private final PendingItem<String> pendingConversationUuid = new PendingItem<>();
|
private final PendingItem<String> pendingConversationUuid = new PendingItem<>();
|
||||||
private ActivityPublishProfilePictureBinding binding;
|
private ActivityPublishProfilePictureBinding binding;
|
||||||
|
|
|
@ -19,7 +19,7 @@ import android.widget.Toast;
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.annotation.StringRes;
|
import androidx.annotation.StringRes;
|
||||||
|
|
||||||
import com.theartofdev.edmodo.cropper.CropImage;
|
import com.canhub.cropper.CropImage;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue