Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Issue #3] Optimize application list for Dual apps. #1338

Merged
merged 2 commits into from
Aug 14, 2023
Merged

[Issue #3] Optimize application list for Dual apps. #1338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c957e0c
* [Issue #3] Bug in the implementation of Api.getPackagesForUser() le…
Aug 10, 2023
b3bf307
* [Issue #3] Bug in the implementation of Api.getPackagesForUser() le…
Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions app/src/main/java/dev/ukanth/ufirewall/Api.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1413,7 +1413,6 @@ public static List<PackageInfoData> getApps(Context ctx, GetAppList appList) {
int count = 0;
try {
listOfUids = new ArrayList<>();
PackageManager pkgmanager = ctx.getPackageManager();
//this code will be executed on devices running ICS or later
final UserManager um = (UserManager) ctx.getSystemService(Context.USER_SERVICE);
List<UserHandle> list = um.getUserProfiles();
Expand All @@ -1433,6 +1432,7 @@ public static List<PackageInfoData> getApps(Context ctx, GetAppList appList) {
if (G.supportDual()) {
pkgManagerFlags |= PackageManager.GET_UNINSTALLED_PACKAGES;
}
PackageManager pkgmanager = ctx.getPackageManager();
List<ApplicationInfo> installed = pkgmanager.getInstalledApplications(pkgManagerFlags);
SparseArray<PackageInfoData> syncMap = new SparseArray<>();
Editor edit = cachePrefs.edit();
Expand All @@ -1448,8 +1448,6 @@ public static List<PackageInfoData> getApps(Context ctx, GetAppList appList) {

SparseArray<PackageInfoData> multiUserAppsMap = new SparseArray<>();

HashMap<Integer,String> listMaps = getPackagesForUser(listOfUids);

for (int i = 0; i < installed.size(); i++) {
//for (ApplicationInfo apinfo : installed) {
count = count + 1;
Expand Down Expand Up @@ -1520,7 +1518,8 @@ public static List<PackageInfoData> getApps(Context ctx, GetAppList appList) {
app.selected_tor = true;
}
if (G.supportDual()) {
checkPartOfMultiUser(apinfo, name, listOfUids, listMaps, multiUserAppsMap);
HashMap<Integer,String> packagesForUser = getPackagesForUser(listOfUids);
checkPartOfMultiUser(apinfo, name, listOfUids, packagesForUser, multiUserAppsMap);
}
}

Expand Down Expand Up @@ -2186,6 +2185,29 @@ public static PackageInfo getPackageDetails(Context ctx, HashMap<Integer, String
}
}

private static Map<Integer, ApplicationInfo> uidToApplicationInfoMap = null;

public static Drawable getApplicationIcon(Context context, int appUid) {
if (uidToApplicationInfoMap == null) {
PackageManager packageManager = context.getPackageManager();
List<ApplicationInfo> installedApplications = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
uidToApplicationInfoMap = new HashMap<>();
for (ApplicationInfo applicationInfo : installedApplications) {
if (!uidToApplicationInfoMap.containsKey(applicationInfo.uid)) {
uidToApplicationInfoMap.put(applicationInfo.uid, applicationInfo);
}
}
}

ApplicationInfo applicationInfo = uidToApplicationInfoMap.get(appUid);
if (applicationInfo != null) {
PackageManager packageManager = context.getPackageManager();
return applicationInfo.loadIcon(packageManager); // The application icon.
} else {
return context.getDrawable(R.drawable.ic_unknown); // The default icon.
}
}

/**
* Called when an application in removed (un-installed) from the system.
* This will look for that application in the selected list and update the persisted values if necessary
Expand Down
31 changes: 3 additions & 28 deletions app/src/main/java/dev/ukanth/ufirewall/log/LogRecyclerViewAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
import android.content.Context;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand All @@ -22,7 +20,6 @@

import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;

Expand Down Expand Up @@ -111,34 +108,12 @@ public void onBindViewHolder(ViewHolder holder, int position) {
PackageManager manager = context.getPackageManager();
holder.bind(logData.get(position),recyclerItemClickListener);
try {
HashMap<Integer,String> listMaps = Api.getPackagesForUser(Api.getListOfUids());
info = Api.getPackageDetails(context, listMaps, data.getUid());
if(info!=null && info.applicationInfo !=null) {
Object drawable = info.applicationInfo.loadIcon(manager);
if (drawable instanceof Bitmap)
holder.icon.setImageBitmap((Bitmap)drawable);
else
holder.icon.setBackground((Drawable)drawable);
} else{
Drawable appIcon = context.getDrawable(R.drawable.ic_unknown);
holder.icon.setImageBitmap(Api.getBitmapFromDrawable(appIcon));
}
Drawable applicationIcon = Api.getApplicationIcon(context, data.getUid());
holder.icon.setBackground(applicationIcon);
} catch (Exception e) {
Log.e(TAG,e.getMessage(),e);
info = null;
try {
if(Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.O) {
holder.icon.setBackground(context.getDrawable(R.drawable.ic_unknown));
} else {
Drawable appIcon = context.getDrawable(R.drawable.ic_unknown);
holder.icon.setImageBitmap(Api.getBitmapFromDrawable(appIcon));
}
}catch (Exception e1) {
Log.e(TAG,e1.getMessage(),e1);
}
Log.e(TAG, e.getMessage(), e);
}


try {
//if(data.getTimestamp() != null && !data.getTimestamp().isEmpty()) {
holder.lastDenied.setText(pretty(new Date(System.currentTimeMillis() - data.getTimestamp())));
Expand Down