From c143e33f6211e1be4d0ac6dc10b728e0d9aa2293 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Thu, 14 Feb 2019 07:34:07 +0100 Subject: [PATCH] Finish #462 Signed-off-by: Mario Danic --- .../talk/controllers/ContactsController.java | 10 +++++++++- .../talk/controllers/ConversationsListController.java | 11 ++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java index 1a0da688d..13af99956 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java @@ -23,6 +23,7 @@ package com.nextcloud.talk.controllers; import android.app.SearchManager; import android.content.Context; import android.content.Intent; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.text.InputType; @@ -68,6 +69,7 @@ import com.nextcloud.talk.utils.KeyboardUtils; import com.nextcloud.talk.utils.bundle.BundleKeys; import com.nextcloud.talk.utils.database.user.UserUtils; +import com.nextcloud.talk.utils.preferences.AppPreferences; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -125,6 +127,8 @@ public class ContactsController extends BaseController implements SearchView.OnQ UserUtils userUtils; @Inject EventBus eventBus; + @Inject + AppPreferences appPreferences; @BindView(R.id.progressBar) ProgressBar progressBar; @BindView(R.id.recycler_view) @@ -355,7 +359,11 @@ public class ContactsController extends BaseController implements SearchView.OnQ searchView = (SearchView) MenuItemCompat.getActionView(searchItem); searchView.setMaxWidth(Integer.MAX_VALUE); searchView.setInputType(InputType.TYPE_TEXT_VARIATION_FILTER); - searchView.setImeOptions(EditorInfo.IME_ACTION_DONE | EditorInfo.IME_FLAG_NO_FULLSCREEN); + int imeOptions = EditorInfo.IME_ACTION_DONE | EditorInfo.IME_FLAG_NO_FULLSCREEN; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && appPreferences.getIsKeyboardIncognito()) { + imeOptions |= EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING; + } + searchView.setImeOptions(imeOptions); searchView.setQueryHint(getResources().getString(R.string.nc_search)); if (searchManager != null) { searchView.setSearchableInfo(searchManager.getSearchableInfo(getActivity().getComponentName())); diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java index ae762afbb..d1abe9c55 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java @@ -25,6 +25,7 @@ import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.text.InputType; @@ -74,6 +75,7 @@ import com.nextcloud.talk.utils.bundle.BundleKeys; import com.nextcloud.talk.utils.database.user.UserUtils; import com.nextcloud.talk.utils.glide.GlideApp; +import com.nextcloud.talk.utils.preferences.AppPreferences; import org.apache.commons.lang3.builder.CompareToBuilder; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -122,6 +124,9 @@ public class ConversationsListController extends BaseController implements Searc @Inject NcApi ncApi; + @Inject + AppPreferences appPreferences; + @BindView(R.id.recycler_view) RecyclerView recyclerView; @@ -240,7 +245,11 @@ public class ConversationsListController extends BaseController implements Searc searchView = (SearchView) MenuItemCompat.getActionView(searchItem); searchView.setMaxWidth(Integer.MAX_VALUE); searchView.setInputType(InputType.TYPE_TEXT_VARIATION_FILTER); - searchView.setImeOptions(EditorInfo.IME_ACTION_DONE | EditorInfo.IME_FLAG_NO_FULLSCREEN); + int imeOptions = EditorInfo.IME_ACTION_DONE | EditorInfo.IME_FLAG_NO_FULLSCREEN; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && appPreferences.getIsKeyboardIncognito()) { + imeOptions |= EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING; + } + searchView.setImeOptions(imeOptions); searchView.setQueryHint(getResources().getString(R.string.nc_search)); if (searchManager != null) { searchView.setSearchableInfo(searchManager.getSearchableInfo(getActivity().getComponentName()));