Browse Source

Finish #462

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 6 years ago
parent
commit
c143e33f62

+ 9 - 1
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.app.SearchManager;
 import android.content.Context;
 import android.content.Context;
 import android.content.Intent;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Handler;
 import android.text.InputType;
 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.bundle.BundleKeys;
 import com.nextcloud.talk.utils.database.user.UserUtils;
 import com.nextcloud.talk.utils.database.user.UserUtils;
 
 
+import com.nextcloud.talk.utils.preferences.AppPreferences;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import org.greenrobot.eventbus.ThreadMode;
@@ -125,6 +127,8 @@ public class ContactsController extends BaseController implements SearchView.OnQ
     UserUtils userUtils;
     UserUtils userUtils;
     @Inject
     @Inject
     EventBus eventBus;
     EventBus eventBus;
+    @Inject
+    AppPreferences appPreferences;
     @BindView(R.id.progressBar)
     @BindView(R.id.progressBar)
     ProgressBar progressBar;
     ProgressBar progressBar;
     @BindView(R.id.recycler_view)
     @BindView(R.id.recycler_view)
@@ -355,7 +359,11 @@ public class ContactsController extends BaseController implements SearchView.OnQ
                 searchView = (SearchView) MenuItemCompat.getActionView(searchItem);
                 searchView = (SearchView) MenuItemCompat.getActionView(searchItem);
                 searchView.setMaxWidth(Integer.MAX_VALUE);
                 searchView.setMaxWidth(Integer.MAX_VALUE);
                 searchView.setInputType(InputType.TYPE_TEXT_VARIATION_FILTER);
                 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));
                 searchView.setQueryHint(getResources().getString(R.string.nc_search));
                 if (searchManager != null) {
                 if (searchManager != null) {
                     searchView.setSearchableInfo(searchManager.getSearchableInfo(getActivity().getComponentName()));
                     searchView.setSearchableInfo(searchManager.getSearchableInfo(getActivity().getComponentName()));

+ 10 - 1
app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java

@@ -25,6 +25,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.BitmapDrawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Handler;
 import android.text.InputType;
 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.database.user.UserUtils;
 import com.nextcloud.talk.utils.glide.GlideApp;
 import com.nextcloud.talk.utils.glide.GlideApp;
 
 
+import com.nextcloud.talk.utils.preferences.AppPreferences;
 import org.apache.commons.lang3.builder.CompareToBuilder;
 import org.apache.commons.lang3.builder.CompareToBuilder;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.Subscribe;
@@ -122,6 +124,9 @@ public class ConversationsListController extends BaseController implements Searc
     @Inject
     @Inject
     NcApi ncApi;
     NcApi ncApi;
 
 
+    @Inject
+    AppPreferences appPreferences;
+
     @BindView(R.id.recycler_view)
     @BindView(R.id.recycler_view)
     RecyclerView recyclerView;
     RecyclerView recyclerView;
 
 
@@ -240,7 +245,11 @@ public class ConversationsListController extends BaseController implements Searc
                 searchView = (SearchView) MenuItemCompat.getActionView(searchItem);
                 searchView = (SearchView) MenuItemCompat.getActionView(searchItem);
                 searchView.setMaxWidth(Integer.MAX_VALUE);
                 searchView.setMaxWidth(Integer.MAX_VALUE);
                 searchView.setInputType(InputType.TYPE_TEXT_VARIATION_FILTER);
                 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));
                 searchView.setQueryHint(getResources().getString(R.string.nc_search));
                 if (searchManager != null) {
                 if (searchManager != null) {
                     searchView.setSearchableInfo(searchManager.getSearchableInfo(getActivity().getComponentName()));
                     searchView.setSearchableInfo(searchManager.getSearchableInfo(getActivity().getComponentName()));