fixed regression of search hint not updating in StartConversation screen

7 files changed, 14 insertions, 7 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index b87a26b0c..6706d004c 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -20,6 +20,7 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.app.ListFragment;
 import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
@@ -259,6 +260,12 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
         configureActionBar(getSupportActionBar());
         binding.speedDial.inflate(R.menu.start_conversation_fab_submenu);
         binding.tabLayout.setupWithViewPager(binding.startConversationViewPager);
+        binding.startConversationViewPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
+            @Override
+            public void onPageSelected(int position) {
+                updateSearchViewHint();
+            }
+        });
         mListPagerAdapter = new ListPagerAdapter(getSupportFragmentManager());
         binding.startConversationViewPager.setAdapter(mListPagerAdapter);
 
@@ -605,7 +612,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
         if (binding.startConversationViewPager.getCurrentItem() == 0) {
             mSearchEditText.setHint(R.string.search_contacts);
         } else {
-            mSearchEditText.setHint(R.string.search_groups);
+            mSearchEditText.setHint(R.string.search_bookmarks);
         }
     }
 
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 0801c2da9..667267d13 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -278,7 +278,7 @@
     <string name="none">لا شيء</string>
     <string name="recently_used">الأكثر استخداما في الآونة الأخيرة</string>
     <string name="search_contacts">البحث عن مراسِلين</string>
-    <string name="search_groups">البحث عن محادثات جماعية</string>
+    <string name="search_bookmarks">البحث عن محادثات جماعية</string>
     <string name="choose_quick_action">اختر إجراءا سريعا</string>
     <string name="send_private_message">أرسل رسالة خاصة</string>
     <string name="username">اسم المستخدم</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index ec6ae1f20..97038eb5f 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -415,7 +415,7 @@
     <string name="none">keine</string>
     <string name="recently_used">zuletzt verwendet</string>
     <string name="search_contacts">Kontakte suchen</string>
-    <string name="search_groups">Gruppenchats suchen</string>
+    <string name="search_bookmarks">Gruppenchats suchen</string>
     <string name="choose_quick_action">Schnell-Taste auswähle</string>
     <string name="send_private_message">Private Nachricht senden</string>
     <string name="user_has_left_conference">%1$s hat den Gruppenchat verlassen!</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 87d93a8c2..35819172b 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -415,7 +415,7 @@
     <string name="none">Ninguna</string>
     <string name="recently_used">Usada más recientemente</string>
     <string name="search_contacts">Buscar contactos</string>
-    <string name="search_groups">Buscar grupos</string>
+    <string name="search_bookmarks">Buscar grupos</string>
     <string name="choose_quick_action">Elegir acción rápida</string>
     <string name="send_private_message">Enviar mensaje privado</string>
     <string name="user_has_left_conference">¡%1$s ha dejado el grupo!</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 641e5f746..b881603e1 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -412,7 +412,7 @@
     <string name="none">Aucune</string>
     <string name="recently_used">Dernière utilisée</string>
     <string name="search_contacts">Rechercher des contacts</string>
-    <string name="search_groups">Rechercher des conférences</string>
+    <string name="search_bookmarks">Rechercher des conférences</string>
     <string name="choose_quick_action">Sélectionner l’action rapide</string>
     <string name="send_private_message">Envoyer un message privé</string>
     <string name="user_has_left_conference">%1$s a quitté la discussion !</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index bbc272b1d..a4d256bc3 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -415,7 +415,7 @@
     <string name="none">Nessuno</string>
     <string name="recently_used">Usati recentemente</string>
     <string name="search_contacts">Cerca contatti</string>
-    <string name="search_groups">Cerca conversazioni di gruppo</string>
+    <string name="search_bookmarks">Cerca conversazioni di gruppo</string>
     <string name="choose_quick_action">Scegli azione rapida</string>
     <string name="send_private_message">Invia messaggio privato</string>
     <string name="user_has_left_conference">%1$s ha lasciato la conversazione di gruppo!</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c75542585..eaadc9919 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -416,7 +416,7 @@
     <string name="none">None</string>
     <string name="recently_used">Most recently used</string>
     <string name="search_contacts">Search contacts</string>
-    <string name="search_groups">Search group chats</string>
+    <string name="search_bookmarks">Search multi user chats</string>
     <string name="choose_quick_action">Choose quick action</string>
     <string name="send_private_message">Send private message</string>
     <string name="user_has_left_conference">%1$s has left the group chat!</string>