Skip to content
This repository has been archived by the owner on Sep 6, 2019. It is now read-only.

Commit

Permalink
3.6.5 beta
Browse files Browse the repository at this point in the history
  • Loading branch information
M66B committed Feb 12, 2015
1 parent 3ce5a74 commit 40327d2
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 8 deletions.
4 changes: 2 additions & 2 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="biz.bokhorst.xprivacy"
android:installLocation="internalOnly"
android:versionCode="466"
android:versionName="3.6.4" >
android:versionCode="467"
android:versionName="3.6.5" >

<uses-sdk
android:minSdkVersion="15"
Expand Down
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ Changelog

[Open issues](https://github.com/M66B/XPrivacy/issues?state=open)

**Version 3.6.4 BETA**
**Version 3.6.5 BETA**

* Use application whitelist for *getPackagesForUid* and *Srv_getPackagesForUid* ([issue](/../../issues/2116))
* Manage white/black lists from usage data (long press uid) ([issue](/../../issues/2093))
* Manage white/black lists from usage data ([issue](/../../issues/2093))
* Long pressing the uid will toggle the whitelist entry and show the whitelist manager

**Version 3.6.2 STABLE**

Expand Down
17 changes: 14 additions & 3 deletions src/biz/bokhorst/xprivacy/ActivityUsage.java
Original file line number Diff line number Diff line change
Expand Up @@ -301,19 +301,30 @@ public void onClick(View view) {
View.OnLongClickListener longClickListener = new View.OnLongClickListener() {
@Override
public boolean onLongClick(View view) {
int userId = Util.getUserId(Process.myUid());
final int userId = Util.getUserId(Process.myUid());
final PRestriction usageData = mUsageAdapter.getItem(position);
final Hook hook = PrivacyManager.getHook(usageData.restrictionName, usageData.methodName);

boolean isApp = PrivacyManager.isApplication(usageData.uid);
boolean odSystem = PrivacyManager.getSettingBool(userId,
final boolean isApp = PrivacyManager.isApplication(usageData.uid);
final boolean odSystem = PrivacyManager.getSettingBool(userId,
PrivacyManager.cSettingOnDemandSystem, false);

if ((isApp || odSystem) && hook != null && hook.whitelist() != null
&& usageData.extra != null) {
if (Util.hasProLicense(ActivityUsage.this) == null)
Util.viewUri(ActivityUsage.this, ActivityMain.cProUri);
else {
// Toggle whitelist entry
Boolean current = PrivacyManager.getSettingBool(usageData.uid, hook.whitelist(),
usageData.extra, false);
PrivacyManager.setSetting(usageData.uid, hook.whitelist(), usageData.extra,
Boolean.toString(!current));
final boolean wnomod = PrivacyManager.getSettingBool(usageData.uid,
PrivacyManager.cSettingWhitelistNoModify, false);
if (!wnomod)
PrivacyManager.updateState(usageData.uid);

// Show whitelist manager
WhitelistTask whitelistsTask = new WhitelistTask(usageData.uid, hook.whitelist(),
ActivityUsage.this);
whitelistsTask.executeOnExecutor(mExecutor, (Object) null);
Expand Down
2 changes: 1 addition & 1 deletion src/biz/bokhorst/xprivacy/PrivacyService.java
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public class PrivacyService extends IPrivacyService.Stub {
private static final String cTableUsage = "usage";
private static final String cTableSetting = "setting";

private static final int cCurrentVersion = 466;
private static final int cCurrentVersion = 467;
private static final String cServiceName = "xprivacy453";

private boolean mCorrupt = false;
Expand Down

0 comments on commit 40327d2

Please sign in to comment.