diff --git a/app/src/main/java/dev/ukanth/ufirewall/log/LogRecyclerViewAdapter.java b/app/src/main/java/dev/ukanth/ufirewall/log/LogRecyclerViewAdapter.java index c7b75b2b..b95315bc 100644 --- a/app/src/main/java/dev/ukanth/ufirewall/log/LogRecyclerViewAdapter.java +++ b/app/src/main/java/dev/ukanth/ufirewall/log/LogRecyclerViewAdapter.java @@ -32,7 +32,6 @@ */ public class LogRecyclerViewAdapter extends RecyclerView.Adapter { - private final List logData; private final Context context; private LogData data; @@ -58,55 +57,11 @@ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { return new ViewHolder(mView); } - /*private Bitmap getAppIcon(PackageManager mPackageManager, ApplicationInfo applicationInfo) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - return getAppIcon26(mPackageManager, applicationInfo); - } - try { - Drawable drawable = mPackageManager.getApplicationIcon(applicationInfo); - return ((BitmapDrawable) drawable).getBitmap(); - } catch (Exception e) { - Log.e(TAG, e.getMessage(), e); - } - return null; - } - - @RequiresApi(api = Build.VERSION_CODES.O) - private Bitmap getAppIcon26(PackageManager mPackageManager, ApplicationInfo applicationInfo) { - Drawable drawable = mPackageManager.getApplicationIcon(applicationInfo); - if (drawable instanceof BitmapDrawable) { - return ((BitmapDrawable) drawable).getBitmap(); - } else if (drawable instanceof AdaptiveIconDrawable) { - Drawable backgroundDr = ((AdaptiveIconDrawable) drawable).getBackground(); - Drawable foregroundDr = ((AdaptiveIconDrawable) drawable).getForeground(); - - Drawable[] drr = new Drawable[2]; - drr[0] = backgroundDr; - drr[1] = foregroundDr; - - LayerDrawable layerDrawable = new LayerDrawable(drr); - - int width = layerDrawable.getIntrinsicWidth(); - int height = layerDrawable.getIntrinsicHeight(); - - Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); - - Canvas canvas = new Canvas(bitmap); - - layerDrawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight()); - layerDrawable.draw(canvas); - - return bitmap; - } - - return null; - }*/ - @Override public void onBindViewHolder(ViewHolder holder, int position) { data = logData.get(position); PackageManager manager = context.getPackageManager(); - holder.bind(logData.get(position),recyclerItemClickListener); + holder.bind(logData.get(position), recyclerItemClickListener); try { Drawable applicationIcon = Api.getApplicationIcon(context, data.getUid()); holder.icon.setBackground(applicationIcon); @@ -149,7 +104,6 @@ public int getItemCount() { return logData.size(); } - public static class ViewHolder extends RecyclerView.ViewHolder { final ImageView icon; diff --git a/app/src/main/java/dev/ukanth/ufirewall/util/AppIconHelperV26.java b/app/src/main/java/dev/ukanth/ufirewall/util/AppIconHelperV26.java deleted file mode 100644 index 080e812b..00000000 --- a/app/src/main/java/dev/ukanth/ufirewall/util/AppIconHelperV26.java +++ /dev/null @@ -1,56 +0,0 @@ -package dev.ukanth.ufirewall.util; - -import static dev.ukanth.ufirewall.Api.TAG; - -import android.content.pm.PackageManager; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.drawable.AdaptiveIconDrawable; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.Drawable; -import android.graphics.drawable.LayerDrawable; -import android.os.Build; - -import androidx.annotation.RequiresApi; - -import dev.ukanth.ufirewall.log.Log; - -public class AppIconHelperV26 { - - @RequiresApi(api = Build.VERSION_CODES.O) - public static Bitmap getAppIcon(PackageManager mPackageManager, String packageName) { - - try { - Drawable drawable = mPackageManager.getApplicationIcon(packageName); - - if (drawable instanceof BitmapDrawable) { - return ((BitmapDrawable) drawable).getBitmap(); - } else if (drawable instanceof AdaptiveIconDrawable) { - Drawable backgroundDr = ((AdaptiveIconDrawable) drawable).getBackground(); - Drawable foregroundDr = ((AdaptiveIconDrawable) drawable).getForeground(); - - Drawable[] drr = new Drawable[2]; - drr[0] = backgroundDr; - drr[1] = foregroundDr; - - LayerDrawable layerDrawable = new LayerDrawable(drr); - - int width = layerDrawable.getIntrinsicWidth(); - int height = layerDrawable.getIntrinsicHeight(); - - Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); - - Canvas canvas = new Canvas(bitmap); - - layerDrawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight()); - layerDrawable.draw(canvas); - - return bitmap; - } - } catch (PackageManager.NameNotFoundException e) { - Log.e(TAG,e.getMessage(),e); - } - - return null; - } -}