CodeCow/PCAPdroid
1
0
Fork 0
mirror of https://github.com/emanuele-f/PCAPdroid.git synced 2026-06-19 21:05:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix missing save button with open search bar

Browse Source
This commit is contained in:
emanuele-f 2021-06-29 01:01:17 +02:00
parent 69f21be864
commit f1a69ccfa7
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionsFragment.java
View File

@ -72,6 +72,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Objects;
public class ConnectionsFragment extends Fragment implements ConnectionsListener, SearchView.OnQueryTextListener {
private static final String TAG = "ConnectionsFragment";
@ -357,7 +358,8 @@ public class ConnectionsFragment extends Fragment implements ConnectionsListener
mAdapter.mWhitelist.addRootDomain(Utils.getRootDomain(conn.info), label);
else if(id == R.id.search_app) {
mSearchView.setIconified(false);
mSearchView.setQuery(mApps.get(conn.uid, 0).getPackageName(), true);
mSearchView.setQuery(Objects.requireNonNull(
mApps.get(conn.uid, 0)).getPackageName(), true);
return true;
} else if(id == R.id.search_host) {
mSearchView.setIconified(false);
@ -500,14 +502,18 @@ public class ConnectionsFragment extends Fragment implements ConnectionsListener
mSearchView.setOnQueryTextListener(this);
if(mFilterToApply != null) {
mSearchView.setQuery(mFilterToApply, true);
String query = mFilterToApply;
mFilterToApply = null;
// Delay to avoid a bug which causes other icons to be hidden when a filter is applied
// from the AppsActivity
(new Handler(requireActivity().getMainLooper())).postDelayed(() -> {
mSearchView.setIconified(false);
}, 50);
mSearchView.setIconified(false);
mMenuItemSearch.expandActionView();
// Delay otherwise the query won't be set
/* NOTE: there is still a bug with "ifRoom" which causes the other icons to be permanently
* hidden when the searchview is collapsed. */
mSearchView.post(() -> {
mSearchView.setQuery(query, true);
});
}
refreshMenuIcons();

2
app/src/main/res/menu/connections_menu.xml
View File

@ -9,7 +9,7 @@
android:icon="@drawable/ic_search"
android:orderInCategory="15"
app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="always" />
app:showAsAction="always|collapseActionView" />
<item
android:id="@+id/hide_whitelist"