From 10cee98913326824b2276444fd166632ddec3d01 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 10 Jun 2018 19:40:55 +0200 Subject: [PATCH] Added expert setting for direct search --- .../conversations/ui/StartConversationActivity.java | 10 +++++++++- src/main/res/values/defaults.xml | 1 + src/main/res/values/strings.xml | 2 ++ src/main/res/xml/preferences.xml | 5 +++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index bd157a132..6799d80d3 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -7,6 +7,7 @@ import android.app.PendingIntent; import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.databinding.DataBindingUtil; import android.net.Uri; @@ -283,7 +284,12 @@ public class StartConversationActivity extends XmppActivity implements XmppConne mConferenceAdapter = new ListItemAdapter(this, conferences); mContactsAdapter = new ListItemAdapter(this, contacts); mContactsAdapter.setOnTagClickedListener(this.mOnTagClickedListener); - this.mHideOfflineContacts = getPreferences().getBoolean("hide_offline", false); + + final SharedPreferences preferences = getPreferences(); + + this.mHideOfflineContacts = preferences.getBoolean("hide_offline", false); + + final boolean startSearching = preferences.getBoolean("start_searching",getResources().getBoolean(R.bool.start_searching)); final Intent intent; if (savedInstanceState == null) { @@ -299,6 +305,8 @@ public class StartConversationActivity extends XmppActivity implements XmppConne if (isViewIntent(intent)) { pendingViewIntent.push(intent); setIntent(createLauncherIntent(this)); + } else if (startSearching && mInitialSearchValue.peek() == null) { + mInitialSearchValue.push(""); } } diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index 5c4cee785..7c5823e6a 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -44,4 +44,5 @@ default_on small false + false diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 339980393..5c9ee8127 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -713,4 +713,6 @@ Copy web address Copy Jabber ID HTTP File Sharing for S3 + Direct Search + At ‘Start Conversation’ screen open keyboard and place cursor in search field diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 9b58cc984..8fd69e557 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -268,6 +268,11 @@ android:title="@string/pref_show_connection_options"/> +