From 0c04d16df0854e9be562bf0e565bfeace2e5bb30 Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Wed, 20 Jan 2021 16:32:28 +0100
Subject: [PATCH] Support further schemes to enter the license

Most of  the app doesn't allow custom scheme URLs. Now we support the following schemes:
* https://android.cryptomator.org/app/license#foo (preferred)
* https://android.cryptomator.org/app/license/foo
* cryptomator://license/foo (legacy)
---
 presentation/src/main/AndroidManifest.xml     | 25 +++++++++++++------
 .../presenter/LicenseCheckPresenter.kt        |  4 +--
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
index 6c71db05..72983265 100644
--- a/presentation/src/main/AndroidManifest.xml
+++ b/presentation/src/main/AndroidManifest.xml
@@ -28,10 +28,10 @@
 		android:allowBackup="true"
 		android:icon="@mipmap/ic_launcher"
 		android:label="@string/app_name"
-		android:supportsRtl="true"
 		android:requestLegacyExternalStorage="true"
-		android:usesCleartextTraffic="true"
-		android:theme="@style/AppTheme">
+		android:supportsRtl="true"
+		android:theme="@style/AppTheme"
+		android:usesCleartextTraffic="true">
 		<!-- Necessary for OneDrive https://stackoverflow.com/a/50779232/825532 -->
 		<uses-library
 			android:name="org.apache.http.legacy"
@@ -67,8 +67,8 @@
 
 		<activity
 			android:name=".ui.activity.SharedFilesActivity"
-			android:taskAffinity=".share"
 			android:excludeFromRecents="true"
+			android:taskAffinity=".share"
 			android:windowSoftInputMode="stateHidden|adjustPan">
 			<intent-filter android:label="@string/share_with_label">
 				<action android:name="android.intent.action.SEND" />
@@ -122,15 +122,26 @@
 		<activity
 			android:name=".ui.activity.LicenseCheckActivity"
 			android:launchMode="singleTask">
-			<intent-filter android:label="@string/fab_transformation_scrim_behavior">
+			<intent-filter android:label="@string/dialog_enter_license_title">
 				<action android:name="android.intent.action.VIEW" />
 
 				<category android:name="android.intent.category.DEFAULT" />
 				<category android:name="android.intent.category.BROWSABLE" />
 
 				<data
-					android:scheme="cryptomator"
-					android:host="*" />
+					android:host="*"
+					android:scheme="cryptomator" />
+			</intent-filter>
+			<intent-filter android:label="@string/dialog_enter_license_title">
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+
+				<data
+					android:host="android.cryptomator.org"
+					android:pathPrefix="/app/license"
+					android:scheme="https" />
 			</intent-filter>
 		</activity>
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/presenter/LicenseCheckPresenter.kt b/presentation/src/main/java/org/cryptomator/presentation/presenter/LicenseCheckPresenter.kt
index 8a321d0f..278a6dfb 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/presenter/LicenseCheckPresenter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/presenter/LicenseCheckPresenter.kt
@@ -16,8 +16,8 @@ class LicenseCheckPresenter @Inject internal constructor(
 		private val sharedPreferencesHandler: SharedPreferencesHandler) : Presenter<UpdateLicenseView>(exceptionHandlers) {
 
 	fun validate(data: Uri?) {
-		if (data != null) {
-			val license = data.lastPathSegment ?: ""
+		data?.let {
+			val license = it.fragment ?: it.lastPathSegment ?: ""
 			view?.showOrUpdateLicenseDialog(license)
 			doLicenseCheckUsecase
 					.withLicense(license)