diff --git a/app/build.gradle b/app/build.gradle index 1374a6b50..40becbad4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "fr.gouv.etalab.mastodon" minSdkVersion 15 targetSdkVersion 25 - versionCode 21 - versionName "1.2.4" + versionCode 22 + versionName "1.2.5" } buildTypes { release { diff --git a/app/mastodon-etalab-v1.2.5.apk b/app/mastodon-etalab-v1.2.5.apk new file mode 100644 index 000000000..615598f64 Binary files /dev/null and b/app/mastodon-etalab-v1.2.5.apk differ diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/WebviewConnectActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/WebviewConnectActivity.java index 21f0fdbf8..6c4696754 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/WebviewConnectActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/WebviewConnectActivity.java @@ -58,7 +58,7 @@ public class WebviewConnectActivity extends AppCompatActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_webview); + setContentView(R.layout.activity_webview_connect); Bundle b = getIntent().getExtras(); if(b != null) instance = b.getString("instance");