diff --git a/app/build.gradle b/app/build.gradle index 69e2690b0..e81ca7ecd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 27 - buildToolsVersion "27.0.2" + buildToolsVersion "27.0.3" defaultConfig { applicationId "fr.gouv.etalab.mastodon" minSdkVersion 15 @@ -34,21 +34,37 @@ allprojects { maven { url "https://maven.google.com"} } } +ext.supportLibraryVersion = '27.0.2' +ext.glideLibraryVersion = '4.6.1' +ext.conscryptLibraryVersion = '1.0.1' +ext.evernoteLibraryVersion = '1.2.2' +ext.gsonLibraryVersion = '2.8.2' +ext.guavaLibraryVersion = '23.6-android' +ext.photoViewLibraryVersion = '2.0.0' +ext.swipebackLibraryVersion = '1.0.2' +ext.ratethisappLibraryVersion = '1.2.0' + dependencies { - implementation 'com.android.support:appcompat-v7:27.0.2' - implementation 'com.android.support:design:27.0.2' - implementation 'com.android.support:support-v4:27.0.2' - implementation 'com.android.support:recyclerview-v7:27.0.2' - implementation 'com.github.bumptech.glide:glide:4.5.0' - annotationProcessor 'com.github.bumptech.glide:compiler:4.5.0' - implementation 'com.evernote:android-job:1.2.2' - implementation 'com.github.chrisbanes:PhotoView:2.0.0' + implementation "com.android.support:appcompat-v7:$supportLibraryVersion" + implementation "com.android.support:design:$supportLibraryVersion" + implementation "com.android.support:support-v4:$supportLibraryVersion" + implementation "com.android.support:recyclerview-v7:$supportLibraryVersion" + implementation "com.android.support:customtabs:$supportLibraryVersion" + implementation "com.github.bumptech.glide:glide:$glideLibraryVersion" + annotationProcessor "com.github.bumptech.glide:compiler:$glideLibraryVersion" + implementation "org.conscrypt:conscrypt-android:$conscryptLibraryVersion" + implementation "com.evernote:android-job:$evernoteLibraryVersion" + implementation "com.google.code.gson:gson:$gsonLibraryVersion" + implementation "com.google.guava:guava:$guavaLibraryVersion" + implementation "com.github.chrisbanes:PhotoView:$photoViewLibraryVersion" + implementation "com.gongwen:swipeback:$swipebackLibraryVersion" + implementation 'com.github.stom79:country-picker-android:1.2.0' implementation 'com.github.stom79:mytransl:1.4' - playstoreImplementation 'io.github.kobakei:ratethisapp:1.2.0' - implementation 'org.conscrypt:conscrypt-android:1.0.0.RC13' - implementation 'com.google.code.gson:gson:2.8.2' - implementation 'com.google.guava:guava:23.6-android' - implementation 'com.gongwen:swipeback:1.0.2' - implementation 'com.android.support:customtabs:27.0.2' + + + playstoreImplementation "io.github.kobakei:ratethisapp:$ratethisappLibraryVersion" + + + } 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 9a9c7f54d..d9ccaf4cb 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 @@ -309,7 +309,7 @@ public class LoginActivity extends BaseActivity { startActivity(i); }else{ String url = redirectUserToAuthorizeAndLogin(client_id, instance); - Helper.openBrowser(getApplicationContext(), url); + Helper.openBrowser(LoginActivity.this, url); } } } catch (JSONException ignored) {ignored.printStackTrace();}