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

Downgrade lib

This commit is contained in:
stom79 2017-12-14 07:26:37 +01:00
parent 4b1db2bfd5
commit 07633c85e6
7 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -44,5 +44,5 @@ dependencies {
implementation 'com.github.stom79:country-picker-android:1.2.0' implementation 'com.github.stom79:country-picker-android:1.2.0'
implementation 'com.github.stom79:mytransl:1.2' implementation 'com.github.stom79:mytransl:1.2'
playstoreImplementation 'io.github.kobakei:ratethisapp:1.2.0' 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'
} }

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

Binary file not shown.

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

@ -2,12 +2,6 @@ package fr.gouv.etalab.mastodon.activities;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.support.v7.app.AppCompatActivity; 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; import fr.gouv.etalab.mastodon.helper.Helper;
@ -19,9 +13,7 @@ import fr.gouv.etalab.mastodon.helper.Helper;
@SuppressLint("Registered") @SuppressLint("Registered")
public class BaseActivity extends AppCompatActivity { public class BaseActivity extends AppCompatActivity {
static { static {
Security.addProvider(Conscrypt.newProvider()); Helper.installProvider();
//Security.insertProviderAt(Conscrypt.newProvider("GmsCore_OpenSSL"), 1);
} }
} }

8
app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
View File

@ -93,6 +93,8 @@ import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.target.Target; import com.bumptech.glide.request.target.Target;
import com.bumptech.glide.request.transition.Transition; import com.bumptech.glide.request.transition.Transition;
import org.conscrypt.Conscrypt;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@ -109,6 +111,8 @@ import java.io.UnsupportedEncodingException;
import java.net.InetAddress; import java.net.InetAddress;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.Provider;
import java.security.Security;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@ -1761,5 +1765,9 @@ public class Helper {
}); });
} }
public static void installProvider(){
Security.addProvider(Conscrypt.newProvider());
}
} }

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

@ -79,7 +79,7 @@ public class HomeTimelineSyncJob extends Job implements OnRetrieveHomeTimelineSe
} }
static { static {
Security.addProvider(Conscrypt.newProvider()); Helper.installProvider();
} }
public static int schedule(boolean updateCurrent){ public static int schedule(boolean updateCurrent){

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

@ -70,8 +70,7 @@ public class NotificationsSyncJob extends Job implements OnRetrieveNotifications
static final String NOTIFICATION_REFRESH = "job_notification"; static final String NOTIFICATION_REFRESH = "job_notification";
static { static {
Security.addProvider(Conscrypt.newProvider()); Helper.installProvider();
} }
@NonNull @NonNull

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

@ -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.Account;
import fr.gouv.etalab.mastodon.client.Entities.Status; import fr.gouv.etalab.mastodon.client.Entities.Status;
import fr.gouv.etalab.mastodon.client.Entities.StoredStatus; 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.AccountDAO;
import fr.gouv.etalab.mastodon.sqlite.Sqlite; import fr.gouv.etalab.mastodon.sqlite.Sqlite;
import fr.gouv.etalab.mastodon.sqlite.StatusStoredDAO; 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"; public static final String SCHEDULED_TOOT = "job_scheduled_toot";
static { static {
Security.addProvider(Conscrypt.newProvider()); Helper.installProvider();
} }
@NonNull @NonNull