Prepare views + percent
This commit is contained in:
parent
7e6e1fcff6
commit
3bf596f1cf
|
@ -53,6 +53,7 @@ import org.eu.exodus_privacy.exodusprivacy.adapters.TrackerListAdapter;
|
||||||
import org.eu.exodus_privacy.exodusprivacy.databinding.MainBinding;
|
import org.eu.exodus_privacy.exodusprivacy.databinding.MainBinding;
|
||||||
import org.eu.exodus_privacy.exodusprivacy.fragments.ComputeAppList;
|
import org.eu.exodus_privacy.exodusprivacy.fragments.ComputeAppList;
|
||||||
import org.eu.exodus_privacy.exodusprivacy.fragments.HomeFragment;
|
import org.eu.exodus_privacy.exodusprivacy.fragments.HomeFragment;
|
||||||
|
import org.eu.exodus_privacy.exodusprivacy.fragments.MyTrackersFragment;
|
||||||
import org.eu.exodus_privacy.exodusprivacy.fragments.ReportFragment;
|
import org.eu.exodus_privacy.exodusprivacy.fragments.ReportFragment;
|
||||||
import org.eu.exodus_privacy.exodusprivacy.fragments.TrackerFragment;
|
import org.eu.exodus_privacy.exodusprivacy.fragments.TrackerFragment;
|
||||||
import org.eu.exodus_privacy.exodusprivacy.fragments.Updatable;
|
import org.eu.exodus_privacy.exodusprivacy.fragments.Updatable;
|
||||||
|
@ -332,7 +333,7 @@ public class MainActivity extends AppCompatActivity {
|
||||||
public Fragment getItem(final int position) {
|
public Fragment getItem(final int position) {
|
||||||
switch (position) {
|
switch (position) {
|
||||||
case 1:
|
case 1:
|
||||||
return new HomeFragment();
|
return new MyTrackersFragment();
|
||||||
default:
|
default:
|
||||||
return home;
|
return home;
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,8 +16,14 @@ import java.security.cert.CertificateFactory;
|
||||||
import java.security.cert.X509Certificate;
|
import java.security.cert.X509Certificate;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.Comparator;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
@ -281,4 +287,17 @@ public class Utils {
|
||||||
}
|
}
|
||||||
return builder.toString();
|
return builder.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public static <K, V> Map<K, V> sortByValue(Map<K, V> map) {
|
||||||
|
List<Map.Entry<K, V>> list = new LinkedList<>(map.entrySet());
|
||||||
|
Collections.sort(list, (Comparator<Object>) (o1, o2) -> ((Comparable<V>) ((Map.Entry<K, V>) (o1)).getValue()).compareTo(((Map.Entry<K, V>) (o2)).getValue()));
|
||||||
|
|
||||||
|
Map<K, V> result = new LinkedHashMap<>();
|
||||||
|
for (Map.Entry<K, V> entry : list) {
|
||||||
|
result.put(entry.getKey(), entry.getValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,103 @@
|
||||||
|
package org.eu.exodus_privacy.exodusprivacy.adapters;
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2020 Thomas Schneider
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License
|
||||||
|
* as published by the Free Software Foundation; either version 3
|
||||||
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import org.eu.exodus_privacy.exodusprivacy.R;
|
||||||
|
import org.eu.exodus_privacy.exodusprivacy.databinding.MyTrackerItemBinding;
|
||||||
|
import org.eu.exodus_privacy.exodusprivacy.objects.MyTracker;
|
||||||
|
import org.eu.exodus_privacy.exodusprivacy.objects.Tracker;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
|
public class MyTrackersListAdapter extends RecyclerView.Adapter<MyTrackersListAdapter.TrackerListViewHolder> {
|
||||||
|
|
||||||
|
private final TrackerClickListener trackerClickListener;
|
||||||
|
private final List<MyTracker> myTrackers;
|
||||||
|
private List<Tracker> trackersList;
|
||||||
|
|
||||||
|
public MyTrackersListAdapter(List<MyTracker> mTrackers, TrackerClickListener listener) {
|
||||||
|
myTrackers = mTrackers;
|
||||||
|
setTrackers(mTrackers);
|
||||||
|
trackerClickListener = listener;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Override
|
||||||
|
public MyTrackersListAdapter.TrackerListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||||
|
MyTrackerItemBinding itemBinding = MyTrackerItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false);
|
||||||
|
return new TrackerListViewHolder(itemBinding);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBindViewHolder(@NonNull MyTrackersListAdapter.TrackerListViewHolder holder, int position) {
|
||||||
|
Tracker tracker = trackersList.get(position);
|
||||||
|
if (tracker != null) {
|
||||||
|
holder.viewDataBinding.trackerName.setText(tracker.name);
|
||||||
|
holder.viewDataBinding.trackerCount.setText(String.valueOf(countOccurences(tracker.codeSignature)));
|
||||||
|
holder.viewDataBinding.getRoot().setOnClickListener(v -> trackerClickListener.onTrackerClick(tracker.id));
|
||||||
|
} else
|
||||||
|
holder.viewDataBinding.trackerName.setText(R.string.no_trackers);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getItemCount() {
|
||||||
|
return trackersList.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTrackers(List<MyTracker> myTrackers) {
|
||||||
|
trackersList = new ArrayList<>();
|
||||||
|
if (myTrackers != null) {
|
||||||
|
for (MyTracker myTracker : myTrackers) {
|
||||||
|
trackersList.add(myTracker.tracker);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private int countOccurences(String signature) {
|
||||||
|
if (myTrackers == null) return 0;
|
||||||
|
for (MyTracker myTracker : myTrackers) {
|
||||||
|
if (myTracker.signature.compareTo(signature) == 0) return myTracker.number;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface TrackerClickListener {
|
||||||
|
void onTrackerClick(long trackerId);
|
||||||
|
}
|
||||||
|
|
||||||
|
static class TrackerListViewHolder extends RecyclerView.ViewHolder {
|
||||||
|
|
||||||
|
MyTrackerItemBinding viewDataBinding;
|
||||||
|
|
||||||
|
TrackerListViewHolder(MyTrackerItemBinding dataBinding) {
|
||||||
|
super(dataBinding.getRoot());
|
||||||
|
viewDataBinding = dataBinding;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -1,173 +0,0 @@
|
||||||
package org.eu.exodus_privacy.exodusprivacy.fragments;
|
|
||||||
|
|
||||||
import android.content.pm.ApplicationInfo;
|
|
||||||
import android.content.pm.PackageInfo;
|
|
||||||
import android.content.pm.PackageManager;
|
|
||||||
import android.os.AsyncTask;
|
|
||||||
|
|
||||||
import org.eu.exodus_privacy.exodusprivacy.Utils;
|
|
||||||
import org.eu.exodus_privacy.exodusprivacy.adapters.ApplicationViewModel;
|
|
||||||
import org.eu.exodus_privacy.exodusprivacy.manager.DatabaseManager;
|
|
||||||
|
|
||||||
import java.lang.ref.WeakReference;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
public class ComputeAppListTask extends AsyncTask<Void, Void, List<ApplicationViewModel>> {
|
|
||||||
|
|
||||||
private static final String gStore = "com.android.vending";
|
|
||||||
private static final String fdroid = "ord.fdroid.fdroid";
|
|
||||||
private final WeakReference<PackageManager> packageManagerRef;
|
|
||||||
private final WeakReference<DatabaseManager> databaseManagerRef;
|
|
||||||
private final WeakReference<Listener> listenerRef;
|
|
||||||
|
|
||||||
order userOrderChoice;
|
|
||||||
|
|
||||||
ComputeAppListTask(WeakReference<PackageManager> packageManagerRef,
|
|
||||||
WeakReference<DatabaseManager> databaseManagerRef,
|
|
||||||
WeakReference<Listener> listenerRef, order orderChoice) {
|
|
||||||
this.packageManagerRef = packageManagerRef;
|
|
||||||
this.databaseManagerRef = databaseManagerRef;
|
|
||||||
this.listenerRef = listenerRef;
|
|
||||||
userOrderChoice = orderChoice;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected List<ApplicationViewModel> doInBackground(Void... params) {
|
|
||||||
PackageManager packageManager = packageManagerRef.get();
|
|
||||||
DatabaseManager databaseManager = databaseManagerRef.get();
|
|
||||||
|
|
||||||
List<ApplicationViewModel> vms = new ArrayList<>();
|
|
||||||
if (packageManager != null && databaseManager != null) {
|
|
||||||
List<PackageInfo> installedPackages = packageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS);
|
|
||||||
vms = applyStoreFilter(installedPackages, databaseManager, packageManager);
|
|
||||||
convertPackagesToViewModels(vms, databaseManager, packageManager);
|
|
||||||
}
|
|
||||||
//Reordering should done here
|
|
||||||
if (userOrderChoice == null) {
|
|
||||||
userOrderChoice = order.DEFAULT;
|
|
||||||
}
|
|
||||||
vms = order(vms, userOrderChoice);
|
|
||||||
return vms;
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<ApplicationViewModel> order(List<ApplicationViewModel> vms, order orderChoice) {
|
|
||||||
if (orderChoice == order.LESS_TRACKERS) {
|
|
||||||
Collections.sort(vms, (obj1, obj2) -> Integer.compare(obj1.requestedPermissions != null ? obj1.requestedPermissions.length : 0, obj2.requestedPermissions != null ? obj2.requestedPermissions.length : 0));
|
|
||||||
Collections.sort(vms, (obj1, obj2) -> Integer.compare(obj1.trackers != null ? obj1.trackers.size() : 0, obj2.trackers != null ? obj2.trackers.size() : 0));
|
|
||||||
} else if (orderChoice == order.MOST_TRACKERS) {
|
|
||||||
Collections.sort(vms, (obj1, obj2) -> Integer.compare(obj2.requestedPermissions != null ? obj2.requestedPermissions.length : 0, obj1.requestedPermissions != null ? obj1.requestedPermissions.length : 0));
|
|
||||||
Collections.sort(vms, (obj1, obj2) -> Integer.compare(obj2.trackers != null ? obj2.trackers.size() : 0, obj1.trackers != null ? obj1.trackers.size() : 0));
|
|
||||||
} else if (orderChoice == order.LESS_PERMISSIONS) {
|
|
||||||
Collections.sort(vms, (obj1, obj2) -> Integer.compare(obj1.trackers != null ? obj1.trackers.size() : 0, obj2.trackers != null ? obj2.trackers.size() : 0));
|
|
||||||
Collections.sort(vms, (obj1, obj2) -> Integer.compare(obj1.requestedPermissions != null ? obj1.requestedPermissions.length : 0, obj2.requestedPermissions != null ? obj2.requestedPermissions.length : 0));
|
|
||||||
} else if (orderChoice == order.MOST_PERMISSIONS) {
|
|
||||||
Collections.sort(vms, (obj1, obj2) -> Integer.compare(obj2.trackers != null ? obj2.trackers.size() : 0, obj1.trackers != null ? obj1.trackers.size() : 0));
|
|
||||||
Collections.sort(vms, (obj1, obj2) -> Integer.compare(obj2.requestedPermissions != null ? obj2.requestedPermissions.length : 0, obj1.requestedPermissions != null ? obj1.requestedPermissions.length : 0));
|
|
||||||
} else {
|
|
||||||
Collections.sort(vms, (obj1, obj2) -> String.valueOf(obj1.label).compareToIgnoreCase(String.valueOf(obj2.label)));
|
|
||||||
}
|
|
||||||
return vms;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onPostExecute(List<ApplicationViewModel> vms) {
|
|
||||||
Listener listener = listenerRef.get();
|
|
||||||
|
|
||||||
if (listener != null) {
|
|
||||||
listener.onAppsComputed(vms);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void convertPackagesToViewModels(List<ApplicationViewModel> appsToBuild,
|
|
||||||
DatabaseManager databaseManager,
|
|
||||||
PackageManager packageManager) {
|
|
||||||
for (ApplicationViewModel vm : appsToBuild) {
|
|
||||||
try {
|
|
||||||
PackageInfo pi = packageManager.getPackageInfo(vm.packageName, PackageManager.GET_PERMISSIONS);
|
|
||||||
buildViewModelFromPackageInfo(vm, pi, databaseManager, packageManager);
|
|
||||||
} catch (PackageManager.NameNotFoundException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void buildViewModelFromPackageInfo(ApplicationViewModel vm, PackageInfo pi,
|
|
||||||
DatabaseManager databaseManager,
|
|
||||||
PackageManager packageManager) {
|
|
||||||
|
|
||||||
vm.versionName = pi.versionName;
|
|
||||||
vm.packageName = pi.packageName;
|
|
||||||
vm.versionCode = pi.versionCode;
|
|
||||||
vm.requestedPermissions = pi.requestedPermissions;
|
|
||||||
|
|
||||||
if (vm.versionName != null)
|
|
||||||
vm.report = databaseManager.getReportFor(vm.packageName, vm.versionName, vm.source);
|
|
||||||
else {
|
|
||||||
vm.report = databaseManager.getReportFor(vm.packageName, vm.versionCode, vm.source);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (vm.report != null) {
|
|
||||||
vm.trackers = databaseManager.getTrackers(vm.report.trackers);
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
vm.icon = packageManager.getApplicationIcon(vm.packageName);
|
|
||||||
} catch (PackageManager.NameNotFoundException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
vm.label = packageManager.getApplicationLabel(pi.applicationInfo);
|
|
||||||
vm.installerPackageName = packageManager.getInstallerPackageName(vm.packageName);
|
|
||||||
vm.isVisible = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<ApplicationViewModel> applyStoreFilter(List<PackageInfo> packageInfos,
|
|
||||||
DatabaseManager databaseManager,
|
|
||||||
PackageManager packageManager) {
|
|
||||||
List<ApplicationViewModel> result = new ArrayList<>();
|
|
||||||
for (PackageInfo packageInfo : packageInfos) {
|
|
||||||
String packageName = packageInfo.packageName;
|
|
||||||
String installerPackageName = packageManager.getInstallerPackageName(packageName);
|
|
||||||
ApplicationViewModel vm = new ApplicationViewModel();
|
|
||||||
vm.packageName = packageName;
|
|
||||||
if (!gStore.equals(installerPackageName) && !fdroid.equals(installerPackageName)) {
|
|
||||||
String auid = Utils.getCertificateSHA1Fingerprint(packageManager, packageName);
|
|
||||||
Map<String, String> sources = databaseManager.getSources(packageName);
|
|
||||||
for (Map.Entry<String, String> entry : sources.entrySet()) {
|
|
||||||
if (entry.getValue().equalsIgnoreCase(auid)) {
|
|
||||||
vm.source = entry.getKey();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (gStore.equals(installerPackageName)) {
|
|
||||||
vm.source = "google";
|
|
||||||
} else {
|
|
||||||
vm.source = "fdroid";
|
|
||||||
}
|
|
||||||
ApplicationInfo appInfo = null;
|
|
||||||
try {
|
|
||||||
appInfo = packageManager.getApplicationInfo(packageName, 0);
|
|
||||||
} catch (PackageManager.NameNotFoundException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
if (vm.source != null && appInfo != null && appInfo.enabled)
|
|
||||||
result.add(vm);
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum order {
|
|
||||||
DEFAULT,
|
|
||||||
MOST_TRACKERS,
|
|
||||||
LESS_TRACKERS,
|
|
||||||
MOST_PERMISSIONS,
|
|
||||||
LESS_PERMISSIONS,
|
|
||||||
}
|
|
||||||
|
|
||||||
interface Listener {
|
|
||||||
void onAppsComputed(List<ApplicationViewModel> apps);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -0,0 +1,140 @@
|
||||||
|
package org.eu.exodus_privacy.exodusprivacy.fragments;
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2020 Thomas Schneider
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License
|
||||||
|
* as published by the Free Software Foundation; either version 3
|
||||||
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.pm.PackageInfo;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.os.Handler;
|
||||||
|
import android.os.Looper;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.annotation.Nullable;
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
|
|
||||||
|
import org.eu.exodus_privacy.exodusprivacy.R;
|
||||||
|
import org.eu.exodus_privacy.exodusprivacy.adapters.MyTrackersListAdapter;
|
||||||
|
import org.eu.exodus_privacy.exodusprivacy.databinding.MyTrackersBinding;
|
||||||
|
import org.eu.exodus_privacy.exodusprivacy.manager.DatabaseManager;
|
||||||
|
import org.eu.exodus_privacy.exodusprivacy.objects.MyTracker;
|
||||||
|
import org.eu.exodus_privacy.exodusprivacy.objects.Report;
|
||||||
|
import org.eu.exodus_privacy.exodusprivacy.objects.Tracker;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
public class MyTrackersFragment extends Fragment implements MyTrackersListAdapter.TrackerClickListener {
|
||||||
|
|
||||||
|
private Context context;
|
||||||
|
private MyTrackersBinding trackerBinding;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(@Nullable Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setHasOptionsMenu(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
|
context = getContext();
|
||||||
|
trackerBinding = MyTrackersBinding.inflate(LayoutInflater.from(context));
|
||||||
|
return trackerBinding.getRoot();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
|
||||||
|
Context context = trackerBinding.getRoot().getContext();
|
||||||
|
trackerBinding.loader.setVisibility(View.VISIBLE);
|
||||||
|
trackerBinding.trackers.setVisibility(View.GONE);
|
||||||
|
new Thread(() -> {
|
||||||
|
DatabaseManager databaseManager = DatabaseManager.getInstance(getActivity());
|
||||||
|
PackageManager packageManager = context.getPackageManager();
|
||||||
|
List<PackageInfo> packageInstalled = packageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS);
|
||||||
|
List<MyTracker> myTrackers = new ArrayList<>();
|
||||||
|
List<String> added = new ArrayList<>();
|
||||||
|
for (PackageInfo pkgInfo : packageInstalled) {
|
||||||
|
Report report;
|
||||||
|
if (pkgInfo.versionName != null)
|
||||||
|
report = databaseManager.getReportFor(pkgInfo.packageName, pkgInfo.versionName, null);
|
||||||
|
else {
|
||||||
|
report = databaseManager.getReportFor(pkgInfo.packageName, pkgInfo.versionCode, null);
|
||||||
|
}
|
||||||
|
if (report != null) {
|
||||||
|
Set<Tracker> trackersApp = databaseManager.getTrackers(report.trackers);
|
||||||
|
for (Tracker tracker : trackersApp) {
|
||||||
|
if (added.contains(tracker.codeSignature)) {
|
||||||
|
for (MyTracker myTracker : myTrackers) {
|
||||||
|
if (myTracker.signature.compareTo(tracker.codeSignature) == 0) {
|
||||||
|
myTracker.number += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
MyTracker myTracker = new MyTracker();
|
||||||
|
myTracker.signature = tracker.codeSignature;
|
||||||
|
myTracker.number = 1;
|
||||||
|
myTracker.tracker = tracker;
|
||||||
|
myTrackers.add(myTracker);
|
||||||
|
added.add(myTracker.signature);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Handler mainHandler = new Handler(Looper.getMainLooper());
|
||||||
|
Runnable myRunnable = () -> {
|
||||||
|
Collections.sort(myTrackers, (obj1, obj2) -> Integer.compare(obj2.number, obj1.number));
|
||||||
|
MyTrackersListAdapter myTrackersListAdapter = new MyTrackersListAdapter(myTrackers, MyTrackersFragment.this);
|
||||||
|
trackerBinding.trackers.setAdapter(myTrackersListAdapter);
|
||||||
|
trackerBinding.trackers.setLayoutManager(new LinearLayoutManager(context));
|
||||||
|
trackerBinding.trackers.setVisibility(View.VISIBLE);
|
||||||
|
trackerBinding.loader.setVisibility(View.GONE);
|
||||||
|
};
|
||||||
|
mainHandler.post(myRunnable);
|
||||||
|
|
||||||
|
|
||||||
|
}).start();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onAttach(@NonNull Context context) {
|
||||||
|
super.onAttach(context);
|
||||||
|
this.context = context;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onPrepareOptionsMenu(Menu menu) {
|
||||||
|
menu.findItem(R.id.action_filter).setVisible(false);
|
||||||
|
menu.findItem(R.id.action_settings).setVisible(false);
|
||||||
|
menu.findItem(R.id.action_filter_options).setVisible(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onTrackerClick(long trackerId) {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
|
@ -221,11 +221,18 @@ public class DatabaseManager extends SQLiteOpenHelper {
|
||||||
if (cursor.moveToFirst()) {
|
if (cursor.moveToFirst()) {
|
||||||
long appId = cursor.getLong(0);
|
long appId = cursor.getLong(0);
|
||||||
cursor.close();
|
cursor.close();
|
||||||
where = "app_id = ? and version = ? and source = ?";
|
if (source != null) {
|
||||||
whereArgs = new String[3];
|
where = "app_id = ? and version = ? and source = ?";
|
||||||
whereArgs[0] = String.valueOf(appId);
|
whereArgs = new String[3];
|
||||||
whereArgs[1] = version;
|
whereArgs[0] = String.valueOf(appId);
|
||||||
whereArgs[2] = source;
|
whereArgs[1] = version;
|
||||||
|
whereArgs[2] = source;
|
||||||
|
} else {
|
||||||
|
where = "app_id = ? and version = ?";
|
||||||
|
whereArgs = new String[2];
|
||||||
|
whereArgs[0] = String.valueOf(appId);
|
||||||
|
whereArgs[1] = version;
|
||||||
|
}
|
||||||
String order = "id ASC";
|
String order = "id ASC";
|
||||||
cursor = db.query("reports", columns, where, whereArgs, null, null, order);
|
cursor = db.query("reports", columns, where, whereArgs, null, null, order);
|
||||||
long reportId;
|
long reportId;
|
||||||
|
@ -234,13 +241,20 @@ public class DatabaseManager extends SQLiteOpenHelper {
|
||||||
cursor.close();
|
cursor.close();
|
||||||
} else {
|
} else {
|
||||||
cursor.close();
|
cursor.close();
|
||||||
|
|
||||||
columns = new String[2];
|
columns = new String[2];
|
||||||
columns[0] = "id";
|
columns[0] = "id";
|
||||||
columns[1] = "creation";
|
columns[1] = "creation";
|
||||||
where = "app_id = ? and source = ?";
|
if (source != null) {
|
||||||
whereArgs = new String[2];
|
where = "app_id = ? and source = ?";
|
||||||
whereArgs[0] = String.valueOf(appId);
|
whereArgs = new String[2];
|
||||||
whereArgs[1] = source;
|
whereArgs[0] = String.valueOf(appId);
|
||||||
|
whereArgs[1] = source;
|
||||||
|
} else {
|
||||||
|
where = "app_id = ?";
|
||||||
|
whereArgs = new String[1];
|
||||||
|
whereArgs[0] = String.valueOf(appId);
|
||||||
|
}
|
||||||
order = "creation DESC";
|
order = "creation DESC";
|
||||||
//search a recent reports
|
//search a recent reports
|
||||||
cursor = db.query("reports", columns, where, whereArgs, null, null, order);
|
cursor = db.query("reports", columns, where, whereArgs, null, null, order);
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
package org.eu.exodus_privacy.exodusprivacy.objects;
|
||||||
|
|
||||||
|
public class MyTracker {
|
||||||
|
|
||||||
|
public String signature;
|
||||||
|
public Tracker tracker;
|
||||||
|
public int number;
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:tint="?attr/colorControlNormal"
|
||||||
|
android:viewportWidth="24"
|
||||||
|
android:viewportHeight="24">
|
||||||
|
<path
|
||||||
|
android:fillColor="@android:color/white"
|
||||||
|
android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z" />
|
||||||
|
</vector>
|
|
@ -0,0 +1,55 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
|
||||||
|
<data />
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_margin="10dp">
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/percent"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="10dp"
|
||||||
|
android:layout_marginBottom="10dp"
|
||||||
|
android:background="@color/colorPrimary"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toStartOf="@+id/details"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tracker_name"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/textColorDark"
|
||||||
|
android:textSize="18sp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/percent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/percent" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tracker_count"
|
||||||
|
android:layout_width="50dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
|
android:textSize="18sp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/percent"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/tracker_name"
|
||||||
|
app:layout_constraintTop_toTopOf="@id/tracker_name" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/details"
|
||||||
|
android:layout_width="24dp"
|
||||||
|
android:layout_height="24dp"
|
||||||
|
android:layout_margin="10dp"
|
||||||
|
android:src="@drawable/ic_baseline_navigate_next_24"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
</layout>
|
|
@ -0,0 +1,34 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/trackers"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/loader"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
|
|
||||||
|
<ProgressBar
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerInParent="true"
|
||||||
|
android:indeterminate="true" />
|
||||||
|
</RelativeLayout>
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
</layout>
|
|
@ -6,6 +6,7 @@
|
||||||
<data>
|
<data>
|
||||||
</data>
|
</data>
|
||||||
<androidx.core.widget.NestedScrollView
|
<androidx.core.widget.NestedScrollView
|
||||||
|
android:background="?android:attr/windowBackground"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue