Adds App Store payment support on Calendar App

app-android/app/src/main/java/de/tutao/tutanota/AndroidMobileSystemFacade.kt

@@ -6,9 +6,11 @@ import android.content.ClipData
 import android.content.Intent
 import android.net.Uri
 import android.provider.Settings
+import android.util.Base64
 import android.util.Log
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricPrompt
+import androidx.core.app.ActivityCompat.startActivityForResult
 import androidx.core.content.ContextCompat.startActivity
 import androidx.core.content.FileProvider
 import androidx.fragment.app.FragmentActivity
@@ -21,6 +23,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.File
 import java.io.IOException
+import java.nio.charset.Charset
 
 class AndroidMobileSystemFacade(
 	private val fileFacade: AndroidFileFacade,
@@ -33,6 +36,8 @@ class AndroidMobileSystemFacade(
 	companion object {
 		private const val TAG = "SystemFacade"
 		const val APP_LOCK_METHOD = "AppLockMethod"
+		const val TUTA_INTENT_ACTION = "TUTA_INTEROP"
+		const val TUTA_INTENT_INTEROP_DATA = "TUTA_INTEROP_DATA"
 	}
 
 	override suspend fun openLink(uri: String): Boolean {
@@ -168,4 +173,35 @@ class AndroidMobileSystemFacade(
 	override suspend fun openMailApp(query: String) {
 		Log.e(TAG, "Trying to open Tuta Mail from Tuta Mail")
 	}
+
+	private fun tryToLaunchStore() {
+		try {
+			val packageId = activity.getString(R.string.package_name).replace("tutanota", "calendar")
+			startActivity(
+				activity,
+				Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=$packageId")),
+				null
+			)
+		} catch (e: Exception) {
+			Log.d(TAG, "Failed to launch store $e")
+		}
+	}
+
+	override suspend fun openCalendarApp(query: String) {
+		val decodedQuery = Base64.decode(query.toByteArray(), Base64.DEFAULT).toString(Charset.defaultCharset())
+		val targetPackageId = activity.getString(R.string.package_name).replace("calendar", "tutanota")
+
+		val intent = Intent()
+		intent.setPackage(targetPackageId)
+		intent.setAction(Intent.ACTION_EDIT)
+		intent.putExtra(TUTA_INTENT_ACTION, "interop")
+		intent.setData(Uri.parse("tutacalendar://interop?$decodedQuery"))
+
+		try {
+			startActivityForResult(activity, intent, 0, null)
+		} catch (e: Exception) {
+			Log.d(TAG, e.toString())
+			tryToLaunchStore()
+		}
+	}
 }

app-android/app/src/main/java/de/tutao/tutanota/MainActivity.kt

@@ -8,6 +8,7 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.ComponentName
 import android.content.Intent
+import android.content.Intent.ACTION_EDIT
 import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.graphics.Color
@@ -453,7 +454,13 @@ class MainActivity : FragmentActivity() {
 			return@launch
 		}
 
-		if (data != null && data.toString().startsWith("tutamail://") && data.host == "interop") {
+		val isInteropCall = intent.action == ACTION_EDIT && intent.getStringExtra(TUTA_INTENT_ACTION) == "interop"
+		val isTrustedCaller = callingPackage == BuildConfig.APPLICATION_ID.replace(
+			"tutanota",
+			"calendar"
+		)
+
+		if (data != null && isInteropCall && isTrustedCaller) {
 			openContactEditor(data)
 		}
 
@@ -804,6 +811,8 @@ class MainActivity : FragmentActivity() {
 		const val OPEN_CONTACT_EDITOR_CONTACT_ID = "contactId"
 		const val OPEN_USER_MAILBOX_MAILID_KEY = "mailId"
 		const val ALREADY_HANDLED_INTENT = "alreadyHandledIntent"
+		const val TUTA_INTENT_ACTION = "TUTA_INTEROP"
+
 		private const val TAG = "MainActivity"
 		private var requestId = 0
 

app-android/calendar/src/main/AndroidManifest.xml

@@ -65,6 +65,15 @@
 
 				<action android:name="android.intent.action.VIEW"/>
 			</intent-filter>
+			<intent-filter>
+				<data
+						android:scheme="tutacalendar"
+						android:host="interop"/>
+				<action android:name="android.intent.action.EDIT"/>
+
+				<category android:name="android.intent.category.DEFAULT"/>
+				<category android:name="android.intent.category.BROWSABLE"/>
+			</intent-filter>
 			<intent-filter>
 				<data
 						android:scheme="tutacalendar"

app-android/calendar/src/main/java/de/tutao/calendar/AndroidMobileSystemFacade.kt

@@ -10,6 +10,7 @@ import android.util.Base64
 import android.util.Log
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricPrompt
+import androidx.core.app.ActivityCompat.startActivityForResult
 import androidx.core.content.ContextCompat.startActivity
 import androidx.core.content.FileProvider
 import androidx.fragment.app.FragmentActivity
@@ -31,12 +32,13 @@ class AndroidMobileSystemFacade(
 	private val activity: MainActivity,
 	private val db: AppDatabase,
 ) : MobileSystemFacade {
-
 	private val authenticationPrompt = AuthenticationPrompt()
 
 	companion object {
 		private const val TAG = "SystemFacade"
 		const val APP_LOCK_METHOD = "AppLockMethod"
+		const val TUTA_INTENT_ACTION = "TUTA_INTEROP"
+		const val TUTA_INTENT_INTEROP_DATA = "TUTA_INTEROP_DATA"
 	}
 
 	override suspend fun openLink(uri: String): Boolean {
@@ -169,11 +171,12 @@ class AndroidMobileSystemFacade(
 		}
 	}
 
-	fun tryToLaunchStore() {
+	private fun tryToLaunchStore() {
 		try {
+			val packageId = activity.getString(R.string.package_name).replace("calendar", "tutanota")
 			startActivity(
 				activity,
-				Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=de.tutao.tutanota")),
+				Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=$packageId")),
 				null
 			)
 		} catch (e: Exception) {
@@ -183,16 +186,23 @@ class AndroidMobileSystemFacade(
 
 	override suspend fun openMailApp(query: String) {
 		val decodedQuery = Base64.decode(query.toByteArray(), Base64.DEFAULT).toString(Charset.defaultCharset())
+		val targetPackageId = activity.getString(R.string.package_name).replace("calendar", "tutanota")
 
 		val intent = Intent()
+		intent.setPackage(targetPackageId)
 		intent.setAction(Intent.ACTION_EDIT)
-		intent.setData(Uri.parse("tutamail://interop?${decodedQuery}"))
+		intent.putExtra(TUTA_INTENT_ACTION, "interop")
+		intent.setData(Uri.parse("tutamail://interop?$decodedQuery"))
 
 		try {
-			startActivity(activity, intent, null)
+			startActivityForResult(activity, intent, 0, null)
 		} catch (e: Exception) {
 			Log.d(TAG, e.toString())
 			tryToLaunchStore()
 		}
 	}
+
+	override suspend fun openCalendarApp(query: String) {
+		Log.e(TAG, "Trying to open Tuta Calendar from Tuta Calendar")
+	}
 }

app-android/tutashared/src/main/java/de/tutao/tutashared/generated_ipc/CommonNativeFacade.kt

@@ -66,4 +66,10 @@ interface CommonNativeFacade {
 	suspend fun handleFileImport(
 		filesUris: List<String>,
 	): Unit
+	/**
+	 * Open a specified path inside settings
+	 */
+	suspend fun openSettings(
+		path: String,
+	): Unit
 }

app-android/tutashared/src/main/java/de/tutao/tutashared/generated_ipc/CommonNativeFacadeSendDispatcher.kt

@@ -123,4 +123,14 @@ class CommonNativeFacadeSendDispatcher (
 		this.transport.sendRequest("ipc", listOf(encodedFacade, encodedMethod) + args)
 	}
 
+	override suspend fun openSettings(
+		path: String,
+	): Unit
+	{
+		val encodedMethod = json.encodeToString("openSettings")
+		val args : MutableList<String> = mutableListOf()
+		args.add(json.encodeToString(path))
+		this.transport.sendRequest("ipc", listOf(encodedFacade, encodedMethod) + args)
+	}
+
 }

app-android/tutashared/src/main/java/de/tutao/tutashared/generated_ipc/MobileSystemFacade.kt

@@ -53,4 +53,7 @@ interface MobileSystemFacade {
 	suspend fun openMailApp(
 		query: String,
 	): Unit
+	suspend fun openCalendarApp(
+		query: String,
+	): Unit
 }

app-android/tutashared/src/main/java/de/tutao/tutashared/generated_ipc/MobileSystemFacadeReceiveDispatcher.kt

@@ -80,6 +80,13 @@ class MobileSystemFacadeReceiveDispatcher(
 				)
 				return json.encodeToString(result)
 			}
+			"openCalendarApp" -> {
+				val query: String = json.decodeFromString(arg[0])
+				val result: Unit = this.facade.openCalendarApp(
+					query,
+				)
+				return json.encodeToString(result)
+			}
 			else -> throw Error("unknown method for MobileSystemFacade: $method")
 		}
 	}

app-android/tutashared/src/main/java/de/tutao/tutashared/generated_ipc/NativeCryptoFacadeReceiveDispatcher.kt

@@ -2,17 +2,16 @@
 
 
 @file:Suppress("NAME_SHADOWING")
-
 package de.tutao.tutashared.ipc
 
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
+import kotlinx.serialization.*
+import kotlinx.serialization.json.*
 
 class NativeCryptoFacadeReceiveDispatcher(
 	private val json: Json,
 	private val facade: NativeCryptoFacade,
 ) {
-
+	
 	suspend fun dispatch(method: String, arg: List<String>): String {
 		when (method) {
 			"rsaEncrypt" -> {
@@ -26,7 +25,6 @@ class NativeCryptoFacadeReceiveDispatcher(
 				)
 				return json.encodeToString(result)
 			}
-
 			"rsaDecrypt" -> {
 				val privateKey: RsaPrivateKey = json.decodeFromString(arg[0])
 				val data: DataWrapper = json.decodeFromString(arg[1])
@@ -36,7 +34,6 @@ class NativeCryptoFacadeReceiveDispatcher(
 				)
 				return json.encodeToString(result)
 			}
-
 			"aesEncryptFile" -> {
 				val key: DataWrapper = json.decodeFromString(arg[0])
 				val fileUri: String = json.decodeFromString(arg[1])
@@ -48,7 +45,6 @@ class NativeCryptoFacadeReceiveDispatcher(
 				)
 				return json.encodeToString(result)
 			}
-
 			"aesDecryptFile" -> {
 				val key: DataWrapper = json.decodeFromString(arg[0])
 				val fileUri: String = json.decodeFromString(arg[1])
@@ -58,7 +54,6 @@ class NativeCryptoFacadeReceiveDispatcher(
 				)
 				return json.encodeToString(result)
 			}
-
 			"argon2idGeneratePassphraseKey" -> {
 				val passphrase: String = json.decodeFromString(arg[0])
 				val salt: DataWrapper = json.decodeFromString(arg[1])
@@ -68,15 +63,13 @@ class NativeCryptoFacadeReceiveDispatcher(
 				)
 				return json.encodeToString(result)
 			}
-
 			"generateKyberKeypair" -> {
 				val seed: DataWrapper = json.decodeFromString(arg[0])
 				val result: KyberKeyPair = this.facade.generateKyberKeypair(
 					seed,
 				)
 				return json.encodeToString(result)
 			}
-
 			"kyberEncapsulate" -> {
 				val publicKey: KyberPublicKey = json.decodeFromString(arg[0])
 				val seed: DataWrapper = json.decodeFromString(arg[1])
@@ -86,7 +79,6 @@ class NativeCryptoFacadeReceiveDispatcher(
 				)
 				return json.encodeToString(result)
 			}
-
 			"kyberDecapsulate" -> {
 				val privateKey: KyberPrivateKey = json.decodeFromString(arg[0])
 				val ciphertext: DataWrapper = json.decodeFromString(arg[1])
@@ -96,7 +88,6 @@ class NativeCryptoFacadeReceiveDispatcher(
 				)
 				return json.encodeToString(result)
 			}
-
 			else -> throw Error("unknown method for NativeCryptoFacade: $method")
 		}
 	}

app-android/tutashared/src/main/java/de/tutao/tutashared/generated_ipc/PersistedCredentials.kt

@@ -3,7 +3,8 @@
 
 package de.tutao.tutashared.ipc
 
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
+import kotlinx.serialization.json.*
 
 
 /**

app-android/tutashared/src/main/java/de/tutao/tutashared/generated_ipc/UnencryptedCredentials.kt

@@ -3,7 +3,8 @@
 
 package de.tutao.tutashared.ipc
 
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
+import kotlinx.serialization.json.*
 
 
 /**

app-ios/TutanotaSharedFramework/GeneratedIpc/CommonNativeFacade.swift

@@ -63,4 +63,10 @@ public protocol CommonNativeFacade {
 	func handleFileImport(
 		_ filesUris: [String]
 	) async throws -> Void
+	/**
+	 * Open a specified path inside settings
+	 */
+	func openSettings(
+		_ path: String
+	) async throws -> Void
 }

app-ios/TutanotaSharedFramework/GeneratedIpc/CommonNativeFacadeSendDispatcher.swift

@@ -129,4 +129,15 @@ public class CommonNativeFacadeSendDispatcher : CommonNativeFacade {
 		let _ = try await self.transport.sendRequest(requestType: "ipc",  args: [encodedFacadeName, encodedMethodName] + args)
 		}
 
+	 public func openSettings(
+		_ path: String
+	) async throws -> Void
+		{
+		var args = [String]()
+		args.append(toJson(path))
+		let encodedFacadeName = toJson("CommonNativeFacade")
+		let encodedMethodName = toJson("openSettings")
+		let _ = try await self.transport.sendRequest(requestType: "ipc",  args: [encodedFacadeName, encodedMethodName] + args)
+		}
+
 }

app-ios/TutanotaSharedFramework/GeneratedIpc/MobileSystemFacade.swift

@@ -50,4 +50,7 @@ public protocol MobileSystemFacade {
 	func openMailApp(
 		_ query: String
 	) async throws -> Void
+	func openCalendarApp(
+		_ query: String
+	) async throws -> Void
 }

app-ios/TutanotaSharedFramework/GeneratedIpc/MobileSystemFacadeReceiveDispatcher.swift

@@ -66,6 +66,12 @@ public class MobileSystemFacadeReceiveDispatcher {
 				query
 			)
 			return "null"
+		case "openCalendarApp":
+			let query = try! JSONDecoder().decode(String.self, from: arg[0].data(using: .utf8)!)
+			try await self.facade.openCalendarApp(
+				query
+			)
+			return "null"
 		default:
 			fatalError("licc messed up! \(method)")
 		}

app-ios/calendar-project.yml

@@ -30,7 +30,6 @@ targets:
         name: "build-calendar-app"
         type: "folder"
         buildPhase: "resources"
-      - path: "Plans.storekit"
     settings:
       base:
         PRODUCT_MODULE_NAME: "calendar"