Move database to /data/system/xprivacy

Refs #1437

CHANGELOG.md

@@ -16,8 +16,8 @@ Changelog
 
 * Toggle restriction will allow to choose between, clear, restrict and template ([issue](/../../issues/1319))
 * Option to select if existing restrictions should be deleted on fetch ([issue](/../../issues/1119))
-* Move database to /data/system ([issue](/../../issues/1437))
-* Submit restricted functions with a whitelist as an exception ([issue](/../../issues/1438))
+* Move database to /data/system/xprivacy ([issue](/../../issues/1437))
+* Submit restricted functions with a whitelist as having an exception ([issue](/../../issues/1438))
 * Updated Dutch translation
 * Updated Italian translation
 

src/biz/bokhorst/xprivacy/PrivacyService.java

@@ -79,6 +79,9 @@ public static void setupDatabase() {
 		try {
 			File dbFile = getDbFile();
 
+			// Create database folder
+			dbFile.getParentFile().mkdirs();
+
 			// Check database folder
 			if (dbFile.getParentFile().isDirectory())
 				Util.log(null, Log.WARN, "Database folder=" + dbFile.getParentFile());
@@ -112,6 +115,7 @@ public static void setupDatabase() {
 			// Owner: rwx (system)
 			// Group: rwx (system)
 			// World: ---
+			Util.setPermissions(dbFile.getParentFile().getAbsolutePath(), 0770, Process.SYSTEM_UID, Process.SYSTEM_UID);
 			File[] files = dbFile.getParentFile().listFiles();
 			if (files != null)
 				for (File file : files)
@@ -220,11 +224,13 @@ public static IPrivacyService getClient() {
 	}
 
 	private static File getDbFile() {
-		return new File(Environment.getDataDirectory() + File.separator + "system" + File.separator + "xprivacy.db");
+		return new File(Environment.getDataDirectory() + File.separator + "system" + File.separator + "xprivacy"
+				+ File.separator + "xprivacy.db");
 	}
 
 	private static File getDbUsageFile() {
-		return new File(Environment.getDataDirectory() + File.separator + "system" + File.separator + "usage.db");
+		return new File(Environment.getDataDirectory() + File.separator + "system" + File.separator + "xprivacy"
+				+ File.separator + "usage.db");
 	}
 
 	public static void reportErrorInternal(String message) {