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

Commit

Permalink
Changed quirk 'noresolve' into 'resolve'
Browse files Browse the repository at this point in the history
  • Loading branch information
M66B committed Aug 16, 2014
1 parent 59e59b2 commit 7d95f65
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ You can install XPrivacy 2.99.x by following these steps:
* Make a full backup, preferable a [NANDroid](http://forum.xda-developers.com/wiki/NANDroid)
* Update to the latest 2.2.x version
* Enter the quirk *test* into the main settings
* Changed quirk *noresolve* into *resolve*, since things should work out-of-the-box (no automatic update)
* Use the menu *Check for updates*

Version 2.99.x and version 3.x will be available with a [pro license](http://www.xprivacy.eu/) only for the time being.
Expand Down
2 changes: 1 addition & 1 deletion res/layout/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
android:id="@+id/etQuirks"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="freeze,noresolve"
android:hint="freeze,resolve"
android:inputType="text"
tools:ignore="HardcodedText" />
</LinearLayout>
Expand Down
2 changes: 1 addition & 1 deletion src/biz/bokhorst/xprivacy/PrivacyManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public class PrivacyManager {
public final static String cSettingCid = "Cid";
public final static String cSettingLac = "Lac";
public final static String cSettingBlacklist = "Blacklist";
public final static String cSettingNoResolve = "NoResolve";
public final static String cSettingResolve = "Resolve";
public final static String cSettingFreeze = "Freeze";
public final static String cSettingPermMan = "PermMan";
public final static String cSettingIntentWall = "IntentWall";
Expand Down
10 changes: 5 additions & 5 deletions src/biz/bokhorst/xprivacy/SettingsDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {

// Get quirks
boolean freeze = PrivacyManager.getSettingBool(-uid, PrivacyManager.cSettingFreeze, false);
boolean noresolve = PrivacyManager.getSettingBool(-uid, PrivacyManager.cSettingNoResolve, false);
boolean resolve = PrivacyManager.getSettingBool(-uid, PrivacyManager.cSettingResolve, false);
boolean permman = PrivacyManager.getSettingBool(-uid, PrivacyManager.cSettingPermMan, false);
boolean iwall = PrivacyManager.getSettingBool(-uid, PrivacyManager.cSettingIntentWall, false);
boolean safemode = PrivacyManager.getSettingBool(-uid, PrivacyManager.cSettingSafeMode, false);
Expand All @@ -249,8 +249,8 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
List<String> listQuirks = new ArrayList<String>();
if (freeze)
listQuirks.add("freeze");
if (noresolve)
listQuirks.add("noresolve");
if (resolve)
listQuirks.add("resolve");
if (permman)
listQuirks.add("permman");
if (iwall)
Expand Down Expand Up @@ -518,8 +518,8 @@ public void onClick(View view) {
List<String> listQuirks = Arrays.asList(etQuirks.getText().toString().split(","));
PrivacyManager.setSetting(uid, PrivacyManager.cSettingFreeze,
Boolean.toString(listQuirks.contains("freeze")));
PrivacyManager.setSetting(uid, PrivacyManager.cSettingNoResolve,
Boolean.toString(listQuirks.contains("noresolve")));
PrivacyManager.setSetting(uid, PrivacyManager.cSettingResolve,
Boolean.toString(listQuirks.contains("resolve")));
PrivacyManager.setSetting(uid, PrivacyManager.cSettingPermMan,
Boolean.toString(listQuirks.contains("permman")));
PrivacyManager.setSetting(uid, PrivacyManager.cSettingIntentWall,
Expand Down
4 changes: 2 additions & 2 deletions src/biz/bokhorst/xprivacy/XIoBridge.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ protected void before(XParam param) throws Throwable {
int port = (Integer) param.args[2];

String hostName;
boolean resolve = !PrivacyManager.getSettingBool(Binder.getCallingUid(),
PrivacyManager.cSettingNoResolve, false);
boolean resolve = PrivacyManager.getSettingBool(Binder.getCallingUid(), PrivacyManager.cSettingResolve,
false);
if (resolve)
try {
hostName = address.getHostName();
Expand Down

0 comments on commit 7d95f65

Please sign in to comment.