Downgrade lib
This commit is contained in:
parent
4b1db2bfd5
commit
07633c85e6
|
@ -44,5 +44,5 @@ dependencies {
|
|||
implementation 'com.github.stom79:country-picker-android:1.2.0'
|
||||
implementation 'com.github.stom79:mytransl:1.2'
|
||||
playstoreImplementation 'io.github.kobakei:ratethisapp:1.2.0'
|
||||
compile 'org.conscrypt:conscrypt-android:1.0.0.RC14'
|
||||
implementation 'org.conscrypt:conscrypt-android:1.0.0.RC13'
|
||||
}
|
||||
|
|
Binary file not shown.
|
@ -2,12 +2,6 @@ package fr.gouv.etalab.mastodon.activities;
|
|||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.support.v7.app.AppCompatActivity;
|
||||
import android.util.Log;
|
||||
|
||||
import org.conscrypt.Conscrypt;
|
||||
|
||||
import java.security.Provider;
|
||||
import java.security.Security;
|
||||
|
||||
import fr.gouv.etalab.mastodon.helper.Helper;
|
||||
|
||||
|
@ -19,9 +13,7 @@ import fr.gouv.etalab.mastodon.helper.Helper;
|
|||
@SuppressLint("Registered")
|
||||
public class BaseActivity extends AppCompatActivity {
|
||||
static {
|
||||
Security.addProvider(Conscrypt.newProvider());
|
||||
//Security.insertProviderAt(Conscrypt.newProvider("GmsCore_OpenSSL"), 1);
|
||||
|
||||
Helper.installProvider();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -93,6 +93,8 @@ import com.bumptech.glide.request.target.SimpleTarget;
|
|||
import com.bumptech.glide.request.target.Target;
|
||||
import com.bumptech.glide.request.transition.Transition;
|
||||
|
||||
import org.conscrypt.Conscrypt;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
|
@ -109,6 +111,8 @@ import java.io.UnsupportedEncodingException;
|
|||
import java.net.InetAddress;
|
||||
import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.security.Provider;
|
||||
import java.security.Security;
|
||||
import java.text.DateFormat;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
|
@ -1761,5 +1765,9 @@ public class Helper {
|
|||
});
|
||||
}
|
||||
|
||||
public static void installProvider(){
|
||||
Security.addProvider(Conscrypt.newProvider());
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -79,7 +79,7 @@ public class HomeTimelineSyncJob extends Job implements OnRetrieveHomeTimelineSe
|
|||
}
|
||||
|
||||
static {
|
||||
Security.addProvider(Conscrypt.newProvider());
|
||||
Helper.installProvider();
|
||||
}
|
||||
public static int schedule(boolean updateCurrent){
|
||||
|
||||
|
|
|
@ -70,8 +70,7 @@ public class NotificationsSyncJob extends Job implements OnRetrieveNotifications
|
|||
|
||||
static final String NOTIFICATION_REFRESH = "job_notification";
|
||||
static {
|
||||
Security.addProvider(Conscrypt.newProvider());
|
||||
|
||||
Helper.installProvider();
|
||||
}
|
||||
|
||||
@NonNull
|
||||
|
|
|
@ -32,6 +32,7 @@ import fr.gouv.etalab.mastodon.client.API;
|
|||
import fr.gouv.etalab.mastodon.client.Entities.Account;
|
||||
import fr.gouv.etalab.mastodon.client.Entities.Status;
|
||||
import fr.gouv.etalab.mastodon.client.Entities.StoredStatus;
|
||||
import fr.gouv.etalab.mastodon.helper.Helper;
|
||||
import fr.gouv.etalab.mastodon.sqlite.AccountDAO;
|
||||
import fr.gouv.etalab.mastodon.sqlite.Sqlite;
|
||||
import fr.gouv.etalab.mastodon.sqlite.StatusStoredDAO;
|
||||
|
@ -46,8 +47,7 @@ public class ScheduledTootsSyncJob extends Job {
|
|||
|
||||
public static final String SCHEDULED_TOOT = "job_scheduled_toot";
|
||||
static {
|
||||
Security.addProvider(Conscrypt.newProvider());
|
||||
|
||||
Helper.installProvider();
|
||||
}
|
||||
|
||||
@NonNull
|
||||
|
|
Loading…
Reference in New Issue