Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bug_fix' into develop

This commit is contained in:
stom79 2017-12-13 19:00:28 +01:00
parent 029e05afc4 7ddb9eee1e
commit 25783079c2
5 changed files with 6 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/playstore/release/app-playstore-release-1.6.7-beta-3.apk
View File

Binary file not shown.

11
app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseActivity.java
View File

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

10
app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java
View File

@ -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){

10
app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java
View File

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

11
app/src/main/java/fr/gouv/etalab/mastodon/jobs/ScheduledTootsSyncJob.java
View File

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