From 770a81d78566c13ea774cc6dd9c6508012519e53 Mon Sep 17 00:00:00 2001
From: M66B <marcel@bokhorst.biz>
Date: Sat, 17 May 2014 12:56:31 +0200
Subject: [PATCH] Easier pro license file import

Fixed #1658
---
 AndroidManifest.xml                         | 10 ++++
 CHANGELOG.md                                |  1 +
 src/biz/bokhorst/xprivacy/ActivityMain.java |  5 ++
 src/biz/bokhorst/xprivacy/Util.java         | 51 +++++++++++----------
 4 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2ac0af012..24afba686 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -80,6 +80,16 @@
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="file" />
+                <data android:host="*" />
+                <data android:mimeType="*/*" />
+                <data android:pathPattern=".*XPrivacy_license.txt" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".ActivityApp"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 634b76227..28b89f28a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ Changelog
 * Fixed displaying contacts without display name ([issue](/../../issues/1660))
 * Fixed on demand restricting for dangerous methods with whitelists ([issue](/../../issues/1653))
 * Not storing salt into database anymore for increased privacy ([issue](/../../issues/1661))
+* Easier pro license file import ([issue](/../../issues/1658))
 
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
 
diff --git a/src/biz/bokhorst/xprivacy/ActivityMain.java b/src/biz/bokhorst/xprivacy/ActivityMain.java
index 499ee8dcd..370157940 100644
--- a/src/biz/bokhorst/xprivacy/ActivityMain.java
+++ b/src/biz/bokhorst/xprivacy/ActivityMain.java
@@ -1,5 +1,6 @@
 package biz.bokhorst.xprivacy;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -169,6 +170,10 @@ protected void onCreate(Bundle savedInstanceState) {
 		if (salt != null && salt.equals(Build.SERIAL))
 			PrivacyManager.setSetting(userId, PrivacyManager.cSettingSalt, null);
 
+		// Import license file
+		if (getIntent().getAction().equals(Intent.ACTION_VIEW))
+			Util.importProLicense(new File(getIntent().getData().getEncodedPath()));
+
 		// Set layout
 		setContentView(R.layout.mainlist);
 		getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
diff --git a/src/biz/bokhorst/xprivacy/Util.java b/src/biz/bokhorst/xprivacy/Util.java
index e2c7af29e..5a9961174 100644
--- a/src/biz/bokhorst/xprivacy/Util.java
+++ b/src/biz/bokhorst/xprivacy/Util.java
@@ -242,6 +242,33 @@ public static String[] getProLicenseUnchecked() {
 		if (!licenseFile.exists())
 			licenseFile = new File(storageDir + File.separator + ".xprivacy" + File.separator + LICENSE_FILE_NAME);
 
+		String importedLicense = importProLicense(licenseFile);
+
+		// Check license file
+		licenseFile = new File(importedLicense);
+		if (licenseFile.exists()) {
+			// Read license
+			try {
+				IniFile iniFile = new IniFile(licenseFile);
+				String name = iniFile.get("name", "");
+				String email = iniFile.get("email", "");
+				String signature = iniFile.get("signature", "");
+				if (name == null || email == null || signature == null)
+					return null;
+				else
+					return new String[] { name, email, signature };
+			} catch (FileNotFoundException ex) {
+				return null;
+			} catch (Throwable ex) {
+				bug(null, ex);
+				return null;
+			}
+		} else
+			Util.log(null, Log.INFO, "Licensing: no license file");
+		return null;
+	}
+
+	public static String importProLicense(File licenseFile) {
 		// Get imported license file name
 		String importedLicense = getUserDataDirectory(Process.myUid()) + File.separator + LICENSE_FILE_NAME;
 
@@ -269,29 +296,7 @@ public static String[] getProLicenseUnchecked() {
 				Util.bug(null, ex);
 			}
 		}
-
-		// Check license file
-		licenseFile = new File(importedLicense);
-		if (licenseFile.exists()) {
-			// Read license
-			try {
-				IniFile iniFile = new IniFile(licenseFile);
-				String name = iniFile.get("name", "");
-				String email = iniFile.get("email", "");
-				String signature = iniFile.get("signature", "");
-				if (name == null || email == null || signature == null)
-					return null;
-				else
-					return new String[] { name, email, signature };
-			} catch (FileNotFoundException ex) {
-				return null;
-			} catch (Throwable ex) {
-				bug(null, ex);
-				return null;
-			}
-		} else
-			Util.log(null, Log.INFO, "Licensing: no license file");
-		return null;
+		return importedLicense;
 	}
 
 	public static Version getProEnablerVersion(Context context) {