Implemented filtering with a button instead of timer.

Author: astonbitecode

java/res/drawable-hdpi/filter.png

@@ -44,13 +44,28 @@
                 android:text="New"/>
     </RelativeLayout>
 
-    <EditText
-            android:id="@+id/editFilter"
+    <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_columnSpan="2"
-            android:hint="Filter the displayed passwords..."
-            android:inputType="text"/>
+            android:orientation="horizontal"
+            android:layout_marginTop="16dp"
+            android:weightSum="2">
+        <EditText
+                android:id="@+id/editFilter"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_columnSpan="2"
+                android:hint="Filter the displayed passwords..."
+                android:inputType="text"/>
+        <Button
+                android:id="@+id/filterButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:background="@android:color/transparent"
+                android:drawableTop="@drawable/filter"
+                android:text="Filter"/>
+    </RelativeLayout>
 
     <ListView
             android:id="@android:id/list"

java/res/drawable-ldpi/filter.png

@@ -68,7 +68,7 @@ public void onClick(View view) {
             String url = nextcloudUrlText.getText() != null ? nextcloudUrlText.getText().toString() : "";
             String user = nextcloudUsernameText.getText() != null ? nextcloudUsernameText.getText().toString() : "";
             String password = nextcloudPasswordText.getText() != null ? nextcloudPasswordText.getText().toString() : "";
-            String useSelfSignedCertString = new Boolean(useSelfSignedCert.isChecked()).toString();
+            String useSelfSignedCertString = Boolean.valueOf(useSelfSignedCert.isChecked()).toString();
             Log.d(TAG, "Saving configuration (password not shown here): " + url + ", " + user + ", " + useSelfSignedCertString);
 
             boolean errorsOccured = false;
@@ -118,7 +118,7 @@ private void prepareUiElements(View v) {
         passwordText.setText(strings.get(2));
         this.nextcloudPasswordText = passwordText;
         CheckBox useSsc = (CheckBox) v.findViewById(R.id.editNextcloudUseSelfSignedCert);
-        useSsc.setChecked(new Boolean(strings.get(3)));
+        useSsc.setChecked(Boolean.valueOf(strings.get(3)));
         this.useSelfSignedCert = useSsc;
 
         TextView dbxTokenLabel = (TextView) v.findViewById(R.id.editConfigurationTokenLabel);

java/res/drawable-mdpi/filter.png

@@ -18,8 +18,6 @@
 import android.app.ListFragment;
 import android.content.Context;
 import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -38,15 +36,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
 
 public class ListEntries extends ListFragment implements OnClickListener, BackButtonHandler {
     private static final long serialVersionUID = 8765819759487480794L;
     private final String TAG = getClass().getName();
     private List<JavaEntry> entries;
     private transient EntriesAdapter entriesAdapter;
     private String filter;
+    private transient EditText filterEditText;
 
     public ListEntries() {
         this.entries = new ArrayList<>();
@@ -68,38 +65,14 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         nb.setOnClickListener(this);
         Button mmb = (Button) rootView.findViewById(R.id.mainMenuButton);
         mmb.setOnClickListener(this);
+        Button fb = (Button) rootView.findViewById(R.id.filterButton);
+        fb.setOnClickListener(this);
 
-        EditText filterText = (EditText) rootView.findViewById(R.id.editFilter);
-        filterText.setText(filter);
-        filterText.addTextChangedListener(new TextWatcher() {
-            private Timer timer = new Timer();
-            private final long DELAY = 500;
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                // ignore
-            }
-
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                // ignore
-            }
-
-            @Override
-            public void afterTextChanged(final Editable s) {
-                timer.cancel();
-                timer = new Timer();
-                timer.schedule(new TimerTask() {
-                    @Override
-                    public void run() {
-                        InterfaceWithRust.INSTANCE.go_to_menu(JavaMenu.EntriesList(s != null ? s.toString() : ""));
-                    }
-                }, DELAY);
-            }
-        });
+        filterEditText = (EditText) rootView.findViewById(R.id.editFilter);
+        filterEditText.setText(filter);
         if (filter.length() > 0) {
-            filterText.setFocusableInTouchMode(true);
-            filterText.requestFocus();
+            filterEditText.setFocusableInTouchMode(true);
+            filterEditText.requestFocus();
         } else {
             // Hide the soft keyboard
             final InputMethodManager imm = (InputMethodManager) getActivity()
@@ -132,6 +105,9 @@ public void onClick(View view) {
         } else if (view.getId() == R.id.addNewButton) {
             Log.d(TAG, "Clicked add new entry");
             InterfaceWithRust.INSTANCE.go_to_menu(JavaMenu.NewEntry());
+        } else if (view.getId() == R.id.filterButton) {
+            Log.d(TAG, "Applying filter");
+            InterfaceWithRust.INSTANCE.go_to_menu(JavaMenu.EntriesList(filterEditText.getText() != null ? filterEditText.getText().toString() : ""));
         }
     }