From 263d586a51ec56b3016ce0caf8ca3ce9f4bb2dc2 Mon Sep 17 00:00:00 2001 From: Vavassor Date: Wed, 15 Mar 2017 20:01:23 -0400 Subject: [PATCH] First bugfix release. Also, added a link to the "No Account?" dialog on the login page. --- app/build.gradle | 4 ++-- app/src/main/java/com/keylesspalace/tusky/LoginActivity.java | 5 ++++- app/src/main/res/values/strings.xml | 5 +++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9368500c5..c43d67e03 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "com.keylesspalace.tusky" minSdkVersion 15 targetSdkVersion 25 - versionCode 9 - versionName "1.0.0" + versionCode 10 + versionName "1.0.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary true } diff --git a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java index 5f7ef0303..7076e9084 100644 --- a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java @@ -23,6 +23,7 @@ import android.content.SharedPreferences; import android.net.Uri; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; +import android.text.method.LinkMovementMethod; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -191,7 +192,7 @@ public class LoginActivity extends AppCompatActivity { noAccount.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new AlertDialog.Builder(context) + AlertDialog dialog = new AlertDialog.Builder(context) .setMessage(R.string.dialog_no_account) .setPositiveButton(R.string.action_close, new DialogInterface.OnClickListener() { @@ -201,6 +202,8 @@ public class LoginActivity extends AppCompatActivity { } }) .show(); + TextView textView = (TextView) dialog.findViewById(android.R.id.message); + textView.setMovementMethod(LinkMovementMethod.getInstance()); } }); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1a3c34c33..a4ad549cc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -92,8 +92,9 @@ Similar to an email address, a Mastodon account can be provided by any one of many - websites.\n\nSo, find the address of one you\'d like to join and enter it here. This will - direct you there to either make an account or log in. + websites.\n\nSo the address of any instance can be entered here, which will direct you + there to either make an account or log in.\n\nMore can be found at + mastodon.social. Finishing Media Upload Uploading…