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

Fix label for apps exclusions

Browse Source
This commit is contained in:
emanuele-f 2021-06-11 21:19:27 +02:00
parent a642ddbd0d
commit c5ef7caf31
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/emanuelef/remote_capture/model/ConnectionsMatcher.java
View File

@ -26,6 +26,7 @@ import android.util.Log;
import androidx.annotation.Nullable;
import com.emanuelef.remote_capture.AppsResolver;
import com.emanuelef.remote_capture.R;
import com.emanuelef.remote_capture.Utils;
import com.google.gson.Gson;
@ -122,7 +123,6 @@ public class ConnectionsMatcher {
JsonObject itemObject = new JsonObject();
itemObject.add("type", new JsonPrimitive(item.getType().name()));
itemObject.add("label", new JsonPrimitive(item.getLabel()));
itemObject.add("value", new JsonPrimitive(item.getValue().toString()));
itemsArr.add(itemObject);
@ -136,6 +136,7 @@ public class ConnectionsMatcher {
private void deserialize(JsonObject object) {
mItems = new ArrayList<>();
JsonArray itemArray = object.getAsJsonArray("items");
AppsResolver resolver = new AppsResolver(mContext);
for(JsonElement el: itemArray) {
JsonObject itemObj = el.getAsJsonObject();
@ -149,8 +150,16 @@ public class ConnectionsMatcher {
}
String val = itemObj.get("value").getAsString();
String label = getLabel(mContext, type, val);
String valLabel = val;
if(type == ItemType.APP) {
AppDescriptor app = resolver.get(Integer.parseInt(val));
if(app != null)
valLabel = app.getName();
}
String label = getLabel(mContext, type, valLabel);
addItem(new Item(type, val, label));
}
}