From 0e51c2e790d2dd0a8158e1efb533935bbffc0056 Mon Sep 17 00:00:00 2001
From: M66B <marcel@faircode.eu>
Date: Fri, 29 Aug 2014 06:54:22 +0200
Subject: [PATCH] 3.0 stable

---
 AndroidManifest.xml                           |  4 ++--
 CHANGELOG.md                                  | 16 ++++++++--------
 src/biz/bokhorst/xprivacy/PrivacyManager.java |  2 +-
 src/biz/bokhorst/xprivacy/PrivacyService.java |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c5a48239e..7ce54da0b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="biz.bokhorst.xprivacy"
     android:installLocation="internalOnly"
-    android:versionCode="413"
-    android:versionName="2.3" >
+    android:versionCode="414"
+    android:versionName="3.0" >
 
     <uses-sdk
         android:minSdkVersion="15"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32c4d373b..1bd8c1fc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,22 +31,24 @@ Changelog
 XPrivacy 3
 ----------
 
-XPrivacy 2.99.x are XPrivacy 3 test/beta versions.
-XPrivacy 2 will not be maintained anymore after XPrivacy 3 has been released.
-See for some more information about XPrivacy 3 [here](https://github.com/M66B/XPrivacy#FAQ68).
+See for more information about XPrivacy 3 [here](https://github.com/M66B/XPrivacy#FAQ68).
 
-You can install XPrivacy 2.99.x / 3.x by following these steps:
+You can install XPrivacy 3.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 (beta) version
+* Update to stable version 2.3
 * If you want to receive test/beta versions: enter the quirk *test* into the main settings
 * Use the main menu *Check for updates* (in the *Help ...* menu in the most recent versions)
 * Make sure notifications are not suppressed by another Xposed module or an application manager
 
-Version 2.99.x and version 3.x will be available with a [pro license](http://www.xprivacy.eu/) only for the time being.
+Version 3.x will be available with a [pro license](http://www.xprivacy.eu/) only for some time.
 
 **Next release**
 
+[Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
+
+**Version 3.0**
+
 Main changes since stable version 2.2.1:
 
 * Reviewed all about 250 restrictions, resulting in numerous changes, mainly visible as performance improvements
@@ -61,8 +63,6 @@ Other changes:
 * Updated Japanese translation
 * Updated Norwegian translation
 
-[Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
-
 **Version 2.99.43 BETA**
 
 * Layout improvement ([pull request](/../../issues/1933))
diff --git a/src/biz/bokhorst/xprivacy/PrivacyManager.java b/src/biz/bokhorst/xprivacy/PrivacyManager.java
index 016b075ce..6596a0cae 100644
--- a/src/biz/bokhorst/xprivacy/PrivacyManager.java
+++ b/src/biz/bokhorst/xprivacy/PrivacyManager.java
@@ -33,7 +33,7 @@
 import android.util.SparseArray;
 
 public class PrivacyManager {
-	public static final boolean cVersion3 = false;
+	public static final boolean cVersion3 = true;
 
 	// This should correspond with restrict_<name> in strings.xml
 	public static final String cAccounts = "accounts";
diff --git a/src/biz/bokhorst/xprivacy/PrivacyService.java b/src/biz/bokhorst/xprivacy/PrivacyService.java
index d14f11703..692c0012b 100644
--- a/src/biz/bokhorst/xprivacy/PrivacyService.java
+++ b/src/biz/bokhorst/xprivacy/PrivacyService.java
@@ -78,7 +78,7 @@ public class PrivacyService extends IPrivacyService.Stub {
 	private static final String cTableUsage = "usage";
 	private static final String cTableSetting = "setting";
 
-	private static final int cCurrentVersion = 413;
+	private static final int cCurrentVersion = 414;
 	private static final String cServiceName = "xprivacy386";
 
 	private SQLiteDatabase mDb = null;