Add new languages to selector and add a default friend request message

markwinter · Sep 12, 2014 · de8b17d · de8b17d
1 parent c2e71bc
commit de8b17d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/app/src/main/java/im/tox/antox/activities/AddFriendActivity.java b/app/src/main/java/im/tox/antox/activities/AddFriendActivity.java
@@ -137,6 +137,10 @@ private int checkAndSend(String key, String originalUsername) {
                 String message = friendMessage.getText().toString();
                 String alias = friendAlias.getText().toString();
 
+                // Check to see if message was blank, if so set a default
+                if(message.equals(""))
+                    message = getString(R.string.addfriend_default_message);
+
                 String[] friendData = {ID, message, alias};
 
                 AntoxDB db = new AntoxDB(getApplicationContext());

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -102,7 +102,7 @@
   <string name="friend_action_delete_chat_confirmation">Sei sicuro di voler eliminare la chat?</string>
   <!--Block Friend Dialog-->
   <string name="friend_action_block_friend_confirmation">Bloccando questo contatto, verrà rimosso dalla tua lista dei contatti e non riceverai più
-richieste d\\'amicizia da lui.\n\nSei sicuro di voler continuare?</string>
+richieste d\'amicizia da lui.\n\nSei sicuro di voler continuare?</string>
   <!--Chat Fragment-->
   <string name="attachment_photo">Allega foto</string>
   <string name="attachment_takephoto">Scatta foto</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -72,6 +72,7 @@
     <string name="addfriend_own_key">You cannot add yourself</string>
     <string name="addfriend_friend_pin_title">Enter Friend\'s Pin</string>
     <string name="addfriend_friend_pin_text">Enter Friend\'s Pin</string>
+    <string name="addfriend_default_message">Hey! Please accept my friend request</string>
 
     <!-- Friend Profile Activity -->
     <string name="friend_profile_name">Name</string>

diff --git a/app/src/main/res/values/strings_activity_settings.xml b/app/src/main/res/values/strings_activity_settings.xml
@@ -51,7 +51,9 @@
         <item>Deutsch</item>
         <item>Español</item>
         <item>Français</item>
+        <item>Hrvatski</item>
         <item>Italiano</item>
+        <item>日本語</item>
         <item>Nederlands</item>
         <item>Polski</item>
         <item>Svenska</item>
@@ -66,7 +68,9 @@
         <item>de</item>
         <item>es</item>
         <item>fr</item>
+        <item>hr</item>
         <item>it</item>
+        <item>ja</item>
         <item>nl</item>
         <item>pl</item>
         <item>sv</item>