From 4f3effe3d855a49ee6076df8fde8a8c03a0faabc Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Sun, 23 Apr 2017 22:26:14 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=A2=E3=82=AB=E3=82=A6=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0?=
 =?UTF-8?q?=E3=81=AB=E3=83=92=E3=83=B3=E3=83=88=E3=81=A8=E6=A4=9C=E8=A8=BC?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/jp/juggler/subwaytooter/dialog/LoginForm.java | 6 ++++++
 app/src/main/res/layout/dlg_account_add.xml                 | 2 ++
 app/src/main/res/values/strings.xml                         | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/dialog/LoginForm.java b/app/src/main/java/jp/juggler/subwaytooter/dialog/LoginForm.java
index f590c688..64ce678d 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/dialog/LoginForm.java
+++ b/app/src/main/java/jp/juggler/subwaytooter/dialog/LoginForm.java
@@ -53,10 +53,16 @@ public class LoginForm {
 				if( TextUtils.isEmpty( instance ) ){
 					Utils.showToast( activity, true, R.string.instance_not_specified );
 					return;
+				}else if( instance.contains( "/" )){
+					Utils.showToast( activity, true, R.string.instance_not_need_slash );
+					return;
 				}
 				if( TextUtils.isEmpty( user_mail ) ){
 					Utils.showToast(activity, true, R.string.mail_not_specified );
 					return;
+				}else if( ! user_mail.contains( "@" ) || ! user_mail.contains( "." )){
+					Utils.showToast( activity, true, R.string.mail_address_not_contains_at_mark );
+					return;
 				}
 				if( TextUtils.isEmpty( password ) ){
 					Utils.showToast( activity, true, R.string.password_not_specified );
diff --git a/app/src/main/res/layout/dlg_account_add.xml b/app/src/main/res/layout/dlg_account_add.xml
index 02896c99..49cd705b 100644
--- a/app/src/main/res/layout/dlg_account_add.xml
+++ b/app/src/main/res/layout/dlg_account_add.xml
@@ -27,6 +27,7 @@
         android:layout_marginRight="12dp"
         android:layout_marginStart="12dp"
         android:inputType="textUri"
+        android:hint="@string/instance_hint"
         />
 
     <TextView
@@ -50,6 +51,7 @@
         android:layout_marginRight="12dp"
         android:layout_marginStart="12dp"
         android:inputType="textEmailAddress"
+        android:hint="@string/mail_hint"
         />
 
     <TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 33e0ea90..ec32c4ed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -128,4 +128,8 @@
     <string name="conversation_view">conversation view</string>
     <string name="conversation">status:%1$d</string>
     <string name="conversation_around">conversation around status:%1$d</string>
+    <string name="instance_not_need_slash">please input just host name of instance, without \'/\'.</string>
+    <string name="mail_address_not_contains_at_mark">please input user mail address that contains \'@\' and \'.\'</string>
+    <string name="instance_hint">ex) mastodon.social</string>
+    <string name="mail_hint">ex) your@e-mail.address</string>
 </resources>