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

Adds conscrypt

This commit is contained in:
stom79 2017-12-12 07:28:47 +01:00
parent aa9bc1a70b
commit 560617750a
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle
View File

@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 27
buildToolsVersion "27.0.1"
buildToolsVersion "27.0.2"
defaultConfig {
applicationId "fr.gouv.etalab.mastodon"
minSdkVersion 15
@ -43,4 +43,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'
implementation files('libs/conscrypt-openjdk-1.0.0.RC14.jar')
}

BIN
app/libs/conscrypt-openjdk-1.0.0.RC14.jar Normal file
View File

Binary file not shown.

5
app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java
View File

@ -34,6 +34,7 @@ import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
import org.conscrypt.OpenSSLProvider;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@ -41,6 +42,7 @@ import org.json.JSONObject;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.security.Security;
import java.util.HashMap;
import fr.gouv.etalab.mastodon.R;
@ -71,6 +73,9 @@ public class LoginActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Security.insertProviderAt(new OpenSSLProvider(), 1);
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE);
int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
if( theme == Helper.THEME_LIGHT){