Merge branch 'master' into playstore

Author: emanuele-f

.gitignore

@@ -18,6 +18,8 @@ pcap/
 .cxx
 app/release/
 app/debug/
+app/standard/
+app/withoutUshark/
 keystore
 
 # Python

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 Releases available at https://github.com/emanuele-f/PCAPdroid/releases
 
+## [1.8.3] - 2025-03-08
+- Fix crash when adding a protocol filter
+- Fix possible Skus deserialization errors (Play build)
+- Fix empty state not visible in edit list views
+- Support building ushark from the source (F-Droid)
+- Update NDK to r26d
+
 ## [1.8.2] - 2025-03-04
 - Fix crash on capture start with port mapping rules
 

app/build.gradle

@@ -9,15 +9,15 @@ android {
             keyPassword 'android'
         }
     }
-    ndkVersion "26.1.10909125"
+    ndkVersion "26.3.11579264"
 
     defaultConfig {
         applicationId "com.emanuelef.remote_capture"
         minSdkVersion 21
         compileSdk 35
         targetSdk 35
-        versionCode 81
-        versionName "1.8.2"
+        versionCode 82
+        versionName "1.8.3"
 
         // only include full translations
         // NOTE: keep in sync with locales_config.xml

app/src/main/java/com/emanuelef/remote_capture/Utils.java

@@ -391,8 +391,11 @@ public static String proto2str(int proto) {
     public static String[] getL7Protocols() {
         if(l7Protocols == null) {
             List<String> protos = CaptureService.getL7Protocols();
-            Collections.sort(protos, String.CASE_INSENSITIVE_ORDER);
-            l7Protocols = protos.toArray(new String[0]);
+
+            if (protos != null) {
+                Collections.sort(protos, String.CASE_INSENSITIVE_ORDER);
+                l7Protocols = protos.toArray(new String[0]);
+            }
         }
 
         return l7Protocols;
@@ -1693,6 +1696,9 @@ public static boolean validateHost(String host) {
     }
 
     public static String uriToFilePath(Context ctx, Uri uri) {
+        if (uri == null)
+            return null;
+
         // https://gist.github.com/r0b0t3d/492f375ec6267a033c23b4ab8ab11e6a
         if (isExternalStorageDocument(uri)) {
             final String docId = DocumentsContract.getDocumentId(uri);

app/src/main/java/com/emanuelef/remote_capture/activities/EditFilterActivity.java

@@ -157,7 +157,10 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         if (reg != null) {
+            long minSizeKB = mFilter.minSize / 1024;
             long maxSizeKB = reg.getMaxBytes() / 1024;
+            maxSizeKB = Math.max(maxSizeKB, minSizeKB);
+
             if (maxSizeKB >= 2) {
                 mSizeSider.setValueTo(maxSizeKB);
                 mSizeSider.setLabelFormatter(value -> Utils.formatBytes(((long) value) * 1024));

app/src/main/java/com/emanuelef/remote_capture/activities/EditListActivity.java

@@ -57,7 +57,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.fragment_activity);
 
         getSupportFragmentManager().beginTransaction()
-                .replace(R.id.fragment, mListInfo.newFragment(true))
+                .replace(R.id.fragment, mListInfo.newFragment())
                 .commit();
     }
 

app/src/main/java/com/emanuelef/remote_capture/activities/FirewallActivity.java

@@ -79,9 +79,9 @@ public Fragment createFragment(int position) {
                 case POS_STATUS:
                     return new FirewallStatus();
                 case POS_BLOCKLIST:
-                    return EditListFragment.newInstance(ListInfo.Type.BLOCKLIST, false);
+                    return EditListFragment.newInstance(ListInfo.Type.BLOCKLIST);
                 case POS_WHITELIST:
-                    return EditListFragment.newInstance(ListInfo.Type.FIREWALL_WHITELIST, false);
+                    return EditListFragment.newInstance(ListInfo.Type.FIREWALL_WHITELIST);
             }
         }
 

app/src/main/java/com/emanuelef/remote_capture/activities/MalwareDetection.java

@@ -74,7 +74,7 @@ public Fragment createFragment(int position) {
                 case POS_BLACKLISTS:
                     return new BlacklistsFragment();
                 case POS_WHITELIST:
-                    return EditListFragment.newInstance(ListInfo.Type.MALWARE_WHITELIST, false);
+                    return EditListFragment.newInstance(ListInfo.Type.MALWARE_WHITELIST);
             }
         }
 

app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionOverview.java

@@ -355,7 +355,8 @@ public void connectionUpdated() {
             mError.setText(R.string.decryption_info_no_rule);
             mError.setVisibility(View.VISIBLE);
         } else if((mConn.getDecryptionStatus() == ConnectionDescriptor.DecryptionStatus.NOT_DECRYPTABLE)
-                && mConn.l7proto.equals("QUIC")) {
+                && mConn.l7proto.equals("QUIC") &&
+                CaptureService.isDecryptingTLS()) {
             mError.setTextColor(ContextCompat.getColor(context, R.color.warning));
             mError.setText(R.string.decrypt_quic_notice);
             mError.setVisibility(View.VISIBLE);

app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionsFragment.java

@@ -843,6 +843,8 @@ private void refreshActiveFilter() {
 
         if ((reg != null) && (minSizeKB > 0)) {
             long maxSizeKb = reg.getMaxBytes() / 1024;
+            maxSizeKb = Math.max(maxSizeKb, minSizeKB);
+
             if (maxSizeKb >= 2) {
                 // NOTE: visible -> hidden transition is performed in onStopTrackingTouch
                 mSizeSlider.setValueTo(maxSizeKb);

app/src/main/java/com/emanuelef/remote_capture/fragments/EditListFragment.java

@@ -82,18 +82,16 @@ public class EditListFragment extends Fragment implements MatchList.ListChangeLi
     private static final int MAX_RULES_BEFORE_WARNING = 5000;
     private static final String TAG = "EditListFragment";
     private static final String LIST_TYPE_ARG = "list_type";
-    private static final String FITS_SYSTEM_WINDOWS_ARG = "fits_system_windows";
 
     private final ActivityResultLauncher<Intent> exportLauncher =
             registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), this::exportResult);
     private final ActivityResultLauncher<Intent> importLauncher =
             registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), this::importResult);
 
-    public static EditListFragment newInstance(ListInfo.Type list, boolean fitsSystemWindows) {
+    public static EditListFragment newInstance(ListInfo.Type list) {
         EditListFragment fragment = new EditListFragment();
         Bundle args = new Bundle();
         args.putSerializable(LIST_TYPE_ARG, list);
-        args.putSerializable(FITS_SYSTEM_WINDOWS_ARG, fitsSystemWindows);
 
         fragment.setArguments(args);
         return fragment;
@@ -110,10 +108,10 @@ public View onCreateView(LayoutInflater inflater,
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         mListView = view.findViewById(R.id.listview);
         mEmptyText = view.findViewById(R.id.list_empty);
+        view.findViewById(R.id.simple_list).setFitsSystemWindows(true);
 
         assert getArguments() != null;
         mListInfo = new ListInfo(Utils.getSerializable(getArguments(), LIST_TYPE_ARG, ListInfo.Type.class));
-        boolean fitsSystemWindows = Boolean.TRUE.equals(Utils.getSerializable(getArguments(), FITS_SYSTEM_WINDOWS_ARG, Boolean.class));
         mList = mListInfo.getList();
         mList.addListChangeListener(this);
 
@@ -175,11 +173,6 @@ public void onDestroyActionMode(ActionMode mode) {
             }
         });
 
-        if (fitsSystemWindows)
-            mListView.setFitsSystemWindows(true);
-        else
-            Utils.fixListviewInsetsBottom(mListView);
-
         mAdapter.reload(mList.iterRules());
         recheckListSize();
     }

app/src/main/java/com/emanuelef/remote_capture/model/ListInfo.java

@@ -141,7 +141,7 @@ public void reloadRules() {
         }
     }
 
-    public EditListFragment newFragment(boolean fitsSystemWindows) {
-        return EditListFragment.newInstance(mType, fitsSystemWindows);
+    public EditListFragment newFragment() {
+        return EditListFragment.newInstance(mType);
     }
 }

app/src/main/jni/core/jni_impl.c

@@ -1073,12 +1073,16 @@ Java_com_emanuelef_remote_1capture_CaptureService_getL7Protocols(JNIEnv *env, jc
     if(!ndpi)
         return(NULL);
 
+    NDPI_PROTOCOL_BITMASK protocols;
+    NDPI_BITMASK_SET_ALL(protocols);
+    ndpi_set_protocol_detection_bitmask2(ndpi, &protocols);
+
     jobject plist = (*env)->NewObject(env, arrayListClass, arrayListNew);
     if((plist == NULL) || jniCheckException(env))
-        return false;
+        return NULL;
 
     bool success = true;
-    int num_protos = (int)ndpi_get_ndpi_num_supported_protocols(ndpi);
+    int num_protos = (int) ndpi_get_ndpi_num_supported_protocols(ndpi);
     ndpi_proto_defaults_t* proto_defaults = ndpi_get_proto_defaults(ndpi);
 
     ndpi_protocol_bitmask_struct_t unique_protos;