Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Fix Trichrome Library installation status mismatch

Closes #2184

See merge request fdroid/fdroidclient!1002
This commit is contained in:
Chirayu Desai 2021-06-02 18:05:23 +00:00
commit 3d53b22e37
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/fdroid/fdroid/data/InstalledAppProviderService.java
View File

@ -23,10 +23,9 @@ import org.fdroid.fdroid.privileged.IPrivilegedService;
import java.io.File; import java.io.File;
import java.io.FilenameFilter; import java.io.FilenameFilter;
import java.util.Collections;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.TreeSet;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -221,13 +220,9 @@ public class InstalledAppProviderService extends JobIntentService {
packageInfoList = context.getPackageManager().getInstalledPackages(PackageManager.GET_SIGNATURES); packageInfoList = context.getPackageManager().getInstalledPackages(PackageManager.GET_SIGNATURES);
} }
Map<String, Long> cachedInfo = InstalledAppProvider.Helper.lastUpdateTimes(context); Map<String, Long> cachedInfo = InstalledAppProvider.Helper.lastUpdateTimes(context);
Collections.sort(packageInfoList, new Comparator<PackageInfo>() { TreeSet<PackageInfo> packageInfoSet = new TreeSet<>((o1, o2) -> o1.packageName.compareTo(o2.packageName));
@Override packageInfoSet.addAll(packageInfoList);
public int compare(PackageInfo o1, PackageInfo o2) { for (PackageInfo packageInfo : packageInfoSet) {
return o1.packageName.compareTo(o2.packageName);
}
});
for (PackageInfo packageInfo : packageInfoList) {
if (cachedInfo.containsKey(packageInfo.packageName)) { if (cachedInfo.containsKey(packageInfo.packageName)) {
if (packageInfo.lastUpdateTime < 1262300400000L // 2010-01-01 00:00 if (packageInfo.lastUpdateTime < 1262300400000L // 2010-01-01 00:00
|| packageInfo.lastUpdateTime > cachedInfo.get(packageInfo.packageName)) { || packageInfo.lastUpdateTime > cachedInfo.get(packageInfo.packageName)) {

11
app/src/main/java/org/fdroid/fdroid/receiver/PackageManagerReceiver.java
View File

@ -3,10 +3,12 @@ package org.fdroid.fdroid.receiver;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Build;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import org.fdroid.fdroid.data.InstalledAppProviderService; import org.fdroid.fdroid.data.InstalledAppProviderService;
import org.fdroid.fdroid.installer.PrivilegedInstaller;
/** /**
* Receive {@link Intent#ACTION_PACKAGE_ADDED} and {@link Intent#ACTION_PACKAGE_REMOVED} * Receive {@link Intent#ACTION_PACKAGE_ADDED} and {@link Intent#ACTION_PACKAGE_REMOVED}
@ -32,6 +34,15 @@ public class PackageManagerReceiver extends BroadcastReceiver {
} else { } else {
InstalledAppProviderService.delete(context, intent.getData()); InstalledAppProviderService.delete(context, intent.getData());
} }
} else if (Intent.ACTION_PACKAGE_CHANGED.equals(action) && Build.VERSION.SDK_INT >= 29 &&
PrivilegedInstaller.isExtensionInstalledCorrectly(context) ==
PrivilegedInstaller.IS_EXTENSION_INSTALLED_YES) {
String[] allowList = new String[]{"org.chromium.chrome"};
for (String allowed : allowList) {
if (allowed.equals(intent.getData().getSchemeSpecificPart())) {
InstalledAppProviderService.compareToPackageManager(context);
}
}
} else { } else {
Log.i(TAG, "unsupported action: " + action + " " + intent); Log.i(TAG, "unsupported action: " + action + " " + intent);
} }