diff --git a/app/build.gradle b/app/build.gradle index ad4caeeb0..e86db1a27 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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') } diff --git a/app/libs/conscrypt-openjdk-1.0.0.RC14.jar b/app/libs/conscrypt-openjdk-1.0.0.RC14.jar new file mode 100644 index 000000000..c454df600 Binary files /dev/null and b/app/libs/conscrypt-openjdk-1.0.0.RC14.jar differ diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java index b420385c7..7e6714b81 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java @@ -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){