diff --git a/app/playstore/release/app-playstore-release-1.6.7-beta-3.apk b/app/playstore/release/app-playstore-release-1.6.7-beta-3.apk index 67a4dbcfd..df2f89423 100644 Binary files a/app/playstore/release/app-playstore-release-1.6.7-beta-3.apk and b/app/playstore/release/app-playstore-release-1.6.7-beta-3.apk differ diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseActivity.java index aff328d23..b97944cb3 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseActivity.java @@ -19,15 +19,8 @@ import fr.gouv.etalab.mastodon.helper.Helper; @SuppressLint("Registered") public class BaseActivity extends AppCompatActivity { static { - boolean isGmsCore_OpenSSL = false; - Provider[] providers = Security.getProviders(); - for(Provider provider: providers){ - if( provider.getName().equals("GmsCore_OpenSSL")) - isGmsCore_OpenSSL = true; - } - if( !isGmsCore_OpenSSL) - Security.addProvider(Security.getProvider("GmsCore_OpenSSL")); - Security.insertProviderAt(Conscrypt.newProvider("GmsCore_OpenSSL"), 1); + Security.insertProviderAt(Conscrypt.newProvider(), 2); + } } diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java index 9ab7aaf68..744719b65 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java @@ -79,15 +79,7 @@ public class HomeTimelineSyncJob extends Job implements OnRetrieveHomeTimelineSe } static { - boolean isGmsCore_OpenSSL = false; - Provider[] providers = Security.getProviders(); - for(Provider provider: providers){ - if( provider.getName().equals("GmsCore_OpenSSL")) - isGmsCore_OpenSSL = true; - } - if( !isGmsCore_OpenSSL) - Security.addProvider(Security.getProvider("GmsCore_OpenSSL")); - Security.insertProviderAt(Conscrypt.newProvider("GmsCore_OpenSSL"), 1); + Security.insertProviderAt(Conscrypt.newProvider(), 2); } public static int schedule(boolean updateCurrent){ diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java index 002f2d9d5..e8ff6be19 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java @@ -70,15 +70,7 @@ public class NotificationsSyncJob extends Job implements OnRetrieveNotifications static final String NOTIFICATION_REFRESH = "job_notification"; static { - boolean isGmsCore_OpenSSL = false; - Provider[] providers = Security.getProviders(); - for(Provider provider: providers){ - if( provider.getName().equals("GmsCore_OpenSSL")) - isGmsCore_OpenSSL = true; - } - if( !isGmsCore_OpenSSL) - Security.addProvider(Security.getProvider("GmsCore_OpenSSL")); - Security.insertProviderAt(Conscrypt.newProvider("GmsCore_OpenSSL"), 1); + Security.insertProviderAt(Conscrypt.newProvider(), 2); } diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ScheduledTootsSyncJob.java b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ScheduledTootsSyncJob.java index 9cd12f372..5f9eae096 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ScheduledTootsSyncJob.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ScheduledTootsSyncJob.java @@ -46,15 +46,8 @@ public class ScheduledTootsSyncJob extends Job { public static final String SCHEDULED_TOOT = "job_scheduled_toot"; static { - boolean isGmsCore_OpenSSL = false; - Provider[] providers = Security.getProviders(); - for(Provider provider: providers){ - if( provider.getName().equals("GmsCore_OpenSSL")) - isGmsCore_OpenSSL = true; - } - if( !isGmsCore_OpenSSL) - Security.addProvider(Security.getProvider("GmsCore_OpenSSL")); - Security.insertProviderAt(Conscrypt.newProvider("GmsCore_OpenSSL"), 1); + Security.insertProviderAt(Conscrypt.newProvider(), 2); + } @NonNull