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 6ce3c791..e7288216 100644 --- a/app/src/main/java/dev/ukanth/ufirewall/log/LogRecyclerViewAdapter.java +++ b/app/src/main/java/dev/ukanth/ufirewall/log/LogRecyclerViewAdapter.java @@ -5,7 +5,6 @@ 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; @@ -14,6 +13,7 @@ import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import java.text.DateFormat; @@ -32,10 +32,7 @@ public class LogRecyclerViewAdapter extends RecyclerView.Adapter logData; private final Context context; - private LogData data; - private PackageInfo info; private final RecyclerItemClickListener recyclerItemClickListener; - private View mView; public LogRecyclerViewAdapter(final Context context, RecyclerItemClickListener recyclerItemClickListener) { this.context = context; @@ -48,9 +45,10 @@ public void updateData(List logDataList) { logData.addAll(logDataList); } + @NonNull @Override public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - mView = LayoutInflater.from(parent.getContext()).inflate(R.layout.log_recycle_item, parent, false); + View mView = LayoutInflater.from(parent.getContext()).inflate(R.layout.log_recycle_item, parent, false); return new ViewHolder(mView); } @@ -100,12 +98,12 @@ private Bitmap getAppIcon26(PackageManager mPackageManager, ApplicationInfo appl @Override public void onBindViewHolder(ViewHolder holder, int position) { - data = logData.get(position); + LogData data = logData.get(position); PackageManager manager = context.getPackageManager(); - holder.bind(logData.get(position),recyclerItemClickListener); + holder.bind(logData.get(position), recyclerItemClickListener); try { - HashMap listMaps = Api.getPackagesForUser(Api.getListOfUids()); - info = Api.getPackageDetails(context, listMaps, data.getUid()); + HashMap listMaps = Api.getPackagesForUser(Api.getListOfUids()); + PackageInfo info = Api.getPackageDetails(context, listMaps, data.getUid()); if(info!=null && info.applicationInfo !=null) { Object drawable = info.applicationInfo.loadIcon(manager); if (drawable instanceof Bitmap) @@ -117,17 +115,16 @@ public void onBindViewHolder(ViewHolder holder, int position) { holder.icon.setImageBitmap(Api.getBitmapFromDrawable(appIcon)); } } catch (Exception e) { - Log.e(TAG,e.getMessage(),e); - info = null; + Log.e(TAG, e.getMessage(), e); try { - if(Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.O) { + 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); + } catch (Exception e1) { + Log.e(TAG, e1.getMessage(), e1); } } try {