Make Contacts app recognize tuta account

Close #7692 Close #6568 Co-authored-by: bir <[email protected]> Co-authored-by: hrb-hub <[email protected]>
tutao · Nov 8, 2024 · da96e64 · da96e64
1 parent 08892e5
commit da96e64
Show file tree

Hide file tree

Showing 12 changed files with 604 additions and 152 deletions.
diff --git a/app-android/app/src/debug/res/values/strings.xml b/app-android/app/src/debug/res/values/strings.xml
@@ -7,4 +7,6 @@
 	<string name="wantToSendReport_msg">Something unexpected went wrong. Do you want to send an error report?  You can add a message to help us fix this error.</string>
 	<string name="downloadCompleted_msg">Download completed</string>
 	<string name="unlockCredentials_action">Unlock credentials</string>
+
+	<string name="account_type" translatable="false">de.tutao.tutanota.debug</string>
 </resources>
diff --git a/app-android/app/src/debugDist/res/values/strings.xml b/app-android/app/src/debugDist/res/values/strings.xml
diff --git a/app-android/app/src/main/AndroidManifest.xml b/app-android/app/src/main/AndroidManifest.xml
@@ -161,29 +161,32 @@
 
 
 		<service
-				android:name="de.tutao.tutashared.credentials.AccountManagerAuthenticatorService"
+				android:name="de.tutao.tutashared.credentials.AccountAuthenticatorService"
 				android:exported="false">
 			<intent-filter>
 				<action android:name="android.accounts.AccountAuthenticator"/>
 			</intent-filter>
+
 			<meta-data
 					android:name="android.accounts.AccountAuthenticator"
-					android:resource="@xml/authenticator"/>
+					android:resource="@xml/account_authenticator"/>
 		</service>
 
 		<service
 				android:name=".StubSyncService"
-				android:exported="false"
+				android:exported="true"
 				android:process=":sync">
 			<intent-filter>
 				<action android:name="android.content.SyncAdapter"/>
 			</intent-filter>
 			<meta-data
 					android:name="android.content.SyncAdapter"
 					android:resource="@xml/syncadapter"/>
+			<meta-data
+					android:name="android.provider.CONTACTS_STRUCTURE"
+					android:resource="@xml/contacts"/>
 		</service>
 
-
 		<receiver
 				android:name=".push.BootBroadcastReceiver"
 				android:exported="false">

diff --git a/app-android/app/src/main/java/de/tutao/tutanota/AndroidMobileContactsFacade.kt b/app-android/app/src/main/java/de/tutao/tutanota/AndroidMobileContactsFacade.kt
diff --git a/app-android/app/src/main/res/values/strings.xml b/app-android/app/src/main/res/values/strings.xml
@@ -1,12 +1,15 @@
 <resources>
-    <string name="app_name" translatable="false">Tuta</string>
-    <string name="reminder_label">Reminder</string>
-    <string name="pushNewMail_msg">New email received.</string>
-    <string name="notificationSync_msg">Synchronizing notifications</string>
-    <string name="scheduleAlarmError_msg">Could not set up an alarm. Please update the application.</string>
-    <string name="wantToSendReport_msg">Something unexpected went wrong. Do you want to send an error report?  You can add a message to help us fix this error.</string>
-    <string name="downloadCompleted_msg">Download completed</string>
-    <string name="unlockCredentials_action">Unlock credentials</string>
-    <string name="delete_action">Delete</string>
-    <string name="markRead_action">Mark read</string>
+	<string name="app_name" translatable="false">Tuta</string>
+	<string name="reminder_label">Reminder</string>
+	<string name="pushNewMail_msg">New email received.</string>
+	<string name="notificationSync_msg">Synchronizing notifications</string>
+	<string name="scheduleAlarmError_msg">Could not set up an alarm. Please update the application.</string>
+	<string name="wantToSendReport_msg">Something unexpected went wrong. Do you want to send an error report?  You can add a message to help us fix this error.</string>
+	<string name="downloadCompleted_msg">Download completed</string>
+	<string name="unlockCredentials_action">Unlock credentials</string>
+	<string name="delete_action">Delete</string>
+	<string name="markRead_action">Mark read</string>
+
+	<!--	FIXME: package -->
+	<string name="account_type" translatable="false">de.tutao.tutanota</string>
 </resources>
diff --git a/app-android/app/src/main/res/xml/account_authenticator.xml b/app-android/app/src/main/res/xml/account_authenticator.xml
@@ -0,0 +1,5 @@
+<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
+					   android:accountType="@string/account_type"
+					   android:icon="@mipmap/ic_logo_round"
+					   android:label="@string/app_name"
+					   android:smallIcon="@mipmap/ic_logo_round"/>
diff --git a/app-android/app/src/main/res/xml/authenticator.xml b/app-android/app/src/main/res/xml/authenticator.xml
diff --git a/app-android/app/src/main/res/xml/contacts.xml b/app-android/app/src/main/res/xml/contacts.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- The base valid EditSchema must contain "name" and "photo" DataKinds -->
+<!-- An invalid EditSchema will result in Tuta not being detected as a contact provider -->
+<ContactsAccountType>
+	<EditSchema>
+		<DataKind kind="photo" maxOccurs="1"/>
+		<DataKind kind="name"
+				  maxOccurs="1"
+				  supportsDisplayName="false"
+				  supportsPrefix="true"
+				  supportsMiddleName="true"
+				  supportsSuffix="true"
+				  supportsPhoneticGivenName="true"
+				  supportsPhoneticMiddleName="true"
+				  supportsPhoneticFamilyName="true"
+				/>
+		<DataKind kind="phone">
+			<Type type="home"/>
+			<Type type="work"/>
+			<Type type="mobile"/>
+			<Type type="other_fax"/>
+			<Type type="other"/>
+			<Type type="custom"/>
+		</DataKind>
+		<DataKind kind="email">
+			<Type type="home"/>
+			<Type type="work"/>
+			<Type type="other"/>
+			<Type type="custom"/>
+		</DataKind>
+		<DataKind kind="nickname" maxOccurs="1"/>
+		<DataKind kind="im">
+			<Type type="custom"/>
+		</DataKind>
+		<DataKind kind="postal" needsStructured="false">
+			<Type type="home"/>
+			<Type type="work"/>
+			<Type type="other"/>
+			<Type type="custom"/>
+		</DataKind>
+		<DataKind kind="organization" maxOccurs="1"/>
+		<DataKind kind="website"/>
+		<DataKind kind="note" maxOccurs="1"/>
+		<DataKind kind="event" dateWithTime="false">
+			<Type type="birthday" maxOccurs="1" yearOptional="true"/>
+		</DataKind>
+		<DataKind kind="relationship">
+			<Type type="parent"/>
+			<Type type="brother"/>
+			<Type type="sister"/>
+			<Type type="child"/>
+			<Type type="friend"/>
+			<Type type="relative"/>
+			<Type type="spouse"/>
+			<Type type="partner"/>
+			<Type type="assistant"/>
+			<Type type="manager"/>
+			<Type type="custom"/>
+		</DataKind>
+	</EditSchema>
+</ContactsAccountType>
diff --git a/app-android/app/src/main/res/xml/syncadapter.xml b/app-android/app/src/main/res/xml/syncadapter.xml
@@ -3,9 +3,9 @@
 <sync-adapter
 		xmlns:android="http://schemas.android.com/apk/res/android"
 		android:contentAuthority="com.android.contacts"
-		android:accountType="@string/package_name"
-		android:userVisible="false"
-		android:supportsUploading="false"
+		android:accountType="@string/account_type"
+		android:userVisible="true"
+		android:supportsUploading="true"
 		android:allowParallelSyncs="false"
 		android:isAlwaysSyncable="true"
-		/>
+		/>
diff --git a/app-android/app/src/releaseTest/res/values/strings.xml b/app-android/app/src/releaseTest/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name" translatable="false">Tuta-Test</string>
+	<string name="account_type" translatable="false">de.tutao.tutanota.test</string>
 </resources>
diff --git a/...als/AccountManagerAuthenticatorService.kt → ...redentials/AccountAuthenticatorService.kt b/...als/AccountManagerAuthenticatorService.kt → ...redentials/AccountAuthenticatorService.kt
@@ -2,11 +2,9 @@ package de.tutao.tutashared.credentials
 
 import android.app.Service
 import android.content.Intent
-
 import android.os.IBinder
 
-
-class AccountManagerAuthenticatorService : Service() {
+class AccountAuthenticatorService : Service() {
 	private var authenticator: AccountManagerAuthenticator? = null
 
 	override fun onCreate() {

diff --git a/...d/tutashared/src/main/java/de/tutao/tutashared/credentials/AccountManagerAuthenticator.kt b/...d/tutashared/src/main/java/de/tutao/tutashared/credentials/AccountManagerAuthenticator.kt
@@ -3,6 +3,7 @@ package de.tutao.tutashared.credentials
 import android.accounts.*
 import android.content.Context
 import android.os.Bundle
+import android.util.Log
 
 class AccountManagerAuthenticator(context: Context) : AbstractAccountAuthenticator(context) {
 	private val context: Context
@@ -16,6 +17,7 @@ class AccountManagerAuthenticator(context: Context) : AbstractAccountAuthenticat
 							authTokenType: String,
 							requiredFeatures: Array<String>,
 							options: Bundle): Bundle? {
+		Log.d("Sync", "AccountManagerAuthenticator addAccount")
 		return null
 	}