Feat/unifiedpush

app/build.gradle.kts

@@ -139,30 +139,35 @@ android {
             register("generic") {
                 applicationId = "com.nextcloud.client"
                 dimension = "default"
+                buildConfigField("boolean", "DEFAULT_PUSH_UNIFIEDPUSH", "true")
             }
 
             register("gplay") {
                 applicationId = "com.nextcloud.client"
                 dimension = "default"
+                buildConfigField("boolean", "DEFAULT_PUSH_UNIFIEDPUSH", "false")
             }
 
             register("huawei") {
                 applicationId = "com.nextcloud.client"
                 dimension = "default"
+                buildConfigField("boolean", "DEFAULT_PUSH_UNIFIEDPUSH", "false")
             }
 
             register("versionDev") {
                 applicationId = "com.nextcloud.android.beta"
                 dimension = "default"
                 versionCode = 20220322
                 versionName = "20220322"
+                buildConfigField("boolean", "DEFAULT_PUSH_UNIFIEDPUSH", "false")
             }
 
             register("qa") {
                 applicationId = "com.nextcloud.android.qa"
                 dimension = "default"
                 versionCode = 1
                 versionName = "1"
+                buildConfigField("boolean", "DEFAULT_PUSH_UNIFIEDPUSH", "false")
             }
         }
     }
@@ -500,6 +505,10 @@ dependencies {
     "gplayImplementation"(libs.bundles.gplay)
     // endregion
 
+    // region Push
+    implementation(libs.unifiedpush.connector)
+    // endregion
+
     // region common
     implementation(libs.ui)
     implementation(libs.common.core)

app/src/generic/java/com/owncloud/android/utils/PushUtils.java

@@ -7,6 +7,7 @@
  */
 package com.owncloud.android.utils;
 
+import android.accounts.Account;
 import android.content.Context;
 
 import com.nextcloud.client.account.UserAccountManager;
@@ -22,6 +23,10 @@ public final class PushUtils {
     private PushUtils() {
     }
 
+    public static void setRegistrationForAccountEnabled(Account account, Boolean enabled) {
+        // do nothing
+    }
+
     public static void pushRegistrationToServer(final UserAccountManager accountManager, final String pushToken) {
         // do nothing
     }

app/src/gplay/java/com/owncloud/android/utils/PushUtils.java

@@ -128,7 +128,24 @@ private static int generateRsa2048KeyPair() {
         return -2;
     }
 
-    private static void deleteRegistrationForAccount(Account account) {
+    /**
+     * Tag the registration as disabled in the local data provider
+     *
+     * @param account
+     */
+    public static void setRegistrationForAccountEnabled(Account account, Boolean enabled) {
+        String arbitraryValue;
+        if (!TextUtils.isEmpty(arbitraryValue = arbitraryDataProvider.getValue(account.name, KEY_PUSH))) {
+            Gson gson = new Gson();
+            PushConfigurationState pushArbitraryData = gson.fromJson(arbitraryValue,
+                                                                     PushConfigurationState.class);
+            pushArbitraryData.shouldBeDisabled = !enabled;
+            if (enabled) pushArbitraryData.disabled = false;
+            arbitraryDataProvider.storeOrUpdateKeyValue(account.name, KEY_PUSH, gson.toJson(pushArbitraryData));
+        }
+    }
+
+    private static void deleteRegistrationForAccount(Account account, Boolean deleteLocalData) {
         Context context = MainApp.getAppContext();
         OwnCloudAccount ocAccount;
         arbitraryDataProvider = new ArbitraryDataProviderImpl(MainApp.getAppContext());
@@ -141,7 +158,8 @@ private static void deleteRegistrationForAccount(Account account) {
             RemoteOperationResult<Void> remoteOperationResult =
                 new UnregisterAccountDeviceForNotificationsOperation().execute(mClient);
 
-            if (remoteOperationResult.getHttpCode() == HttpStatus.SC_ACCEPTED) {
+            int status = remoteOperationResult.getHttpCode();
+            if (deleteLocalData && status == HttpStatus.SC_ACCEPTED) {
                 String arbitraryValue;
                 if (!TextUtils.isEmpty(arbitraryValue = arbitraryDataProvider.getValue(account.name, KEY_PUSH))) {
                     Gson gson = new Gson();
@@ -157,6 +175,19 @@ private static void deleteRegistrationForAccount(Account account) {
                         arbitraryDataProvider.deleteKeyForAccount(account.name, KEY_PUSH);
                     }
                 }
+            } else if (!deleteLocalData && (status == HttpStatus.SC_ACCEPTED || status == HttpStatus.SC_OK)) {
+                String arbitraryValue;
+                if (!TextUtils.isEmpty(arbitraryValue = arbitraryDataProvider.getValue(account.name, KEY_PUSH))) {
+                    Gson gson = new Gson();
+                    PushConfigurationState pushArbitraryData = gson.fromJson(arbitraryValue,
+                                                                             PushConfigurationState.class);
+                    pushArbitraryData.disabled = true;
+                    pushArbitraryData.pushToken = "";
+                    arbitraryDataProvider.storeOrUpdateKeyValue(
+                        account.name,
+                        KEY_PUSH,
+                        gson.toJson(pushArbitraryData));
+                }
             }
         } catch (com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException e) {
             Log_OC.d(TAG, "Failed to find an account");
@@ -197,9 +228,19 @@ public static void pushRegistrationToServer(final UserAccountManager accountMana
                         accountPushData = null;
                     }
 
+                    if (accountPushData == null || providerValue.isEmpty()) {
+                        Log_OC.d(TAG, "accountPushData is null");
+                    } else {
+                        Log_OC.d(TAG, "ShouldBeDeleted=" + accountPushData.isShouldBeDeleted() +
+                            " disabled=" + accountPushData.disabled +
+                            " shouldBeDisabled=" + accountPushData.shouldBeDisabled
+                            + " sameToken=" + accountPushData.getPushToken().equals(token));
+                    }
                     if (accountPushData != null && !accountPushData.getPushToken().equals(token) &&
-                            !accountPushData.isShouldBeDeleted() ||
+                            !accountPushData.isShouldBeDeleted() && !accountPushData.disabled &&
+                            !accountPushData.shouldBeDisabled ||
                             TextUtils.isEmpty(providerValue)) {
+                        Log_OC.d(TAG, "Registering " + account.name);
                         try {
                             OwnCloudAccount ocAccount = new OwnCloudAccount(account, context);
                             NextcloudClient client = OwnCloudClientManagerFactory.getDefaultSingleton().
@@ -244,7 +285,11 @@ public static void pushRegistrationToServer(final UserAccountManager accountMana
                             Log_OC.d(TAG, "Failed via OperationCanceledException");
                         }
                     } else if (accountPushData != null && accountPushData.isShouldBeDeleted()) {
-                        deleteRegistrationForAccount(account);
+                        Log_OC.d(TAG, "Deleting " + account.name);
+                        deleteRegistrationForAccount(account, true);
+                    } else if (accountPushData != null && accountPushData.shouldBeDisabled && !accountPushData.disabled) {
+                        Log_OC.d(TAG, "Disabling " + account.name);
+                        deleteRegistrationForAccount(account, false);
                     }
                 }
             }
@@ -336,11 +381,19 @@ private static int saveKeyToFile(Key key, String path) {
         return -1;
     }
 
+    /**
+     * Reinit keys, [pushRegistrationToServer]\* must be called to take effect
+     *
+     * \* You likely need to call [UnifiedPushUtils.registerCurrentPushConfiguration], which will call
+     * pushRegistrationToServer if needed
+     *
+     * @param accountManager
+     */
     public static void reinitKeys(final UserAccountManager accountManager) {
         Context context = MainApp.getAppContext();
         Account[] accounts = accountManager.getAccounts();
         for (Account account : accounts) {
-            deleteRegistrationForAccount(account);
+            deleteRegistrationForAccount(account, true);
         }
 
         String keyPath = context.getDir("nc-keypair", Context.MODE_PRIVATE).getAbsolutePath();
@@ -352,7 +405,6 @@ public static void reinitKeys(final UserAccountManager accountManager) {
 
         AppPreferences preferences = AppPreferencesImpl.fromContext(context);
         String pushToken = preferences.getPushToken();
-        pushRegistrationToServer(accountManager, pushToken);
         preferences.setKeysReInitEnabled();
     }
 

app/src/huawei/java/com/owncloud/android/utils/PushUtils.java

@@ -7,6 +7,7 @@
  */
 package com.owncloud.android.utils;
 
+import android.accounts.Account;
 import android.content.Context;
 
 import com.nextcloud.client.account.UserAccountManager;
@@ -22,6 +23,10 @@ public final class PushUtils {
     private PushUtils() {
     }
 
+    public static void setRegistrationForAccountEnabled(Account account, Boolean enabled) {
+        // do nothing
+    }
+
     public static void pushRegistrationToServer(final UserAccountManager accountManager, final String pushToken) {
         // do nothing
     }

app/src/main/AndroidManifest.xml

@@ -661,6 +661,14 @@
             android:enabled="true"
             android:exported="true"
             tools:ignore="ExportedService" />
+        <service
+            android:name="com.owncloud.android.services.UnifiedPushService"
+            android:enabled="true"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="org.unifiedpush.android.connector.PUSH_EVENT"/>
+            </intent-filter>
+        </service>
 
         <activity
             android:name=".ui.activity.SsoGrantPermissionActivity"

app/src/main/java/com/nextcloud/client/di/ComponentsModule.java

@@ -46,6 +46,7 @@
 import com.owncloud.android.providers.UsersAndGroupsSearchProvider;
 import com.owncloud.android.services.AccountManagerService;
 import com.owncloud.android.services.OperationsService;
+import com.owncloud.android.services.UnifiedPushService;
 import com.owncloud.android.syncadapter.FileSyncService;
 import com.owncloud.android.ui.activities.ActivitiesActivity;
 import com.owncloud.android.ui.activity.BaseActivity;
@@ -349,6 +350,9 @@ abstract class ComponentsModule {
     @ContributesAndroidInjector
     abstract OperationsService operationsService();
 
+    @ContributesAndroidInjector
+    abstract UnifiedPushService unifiedPushService();
+
     @ContributesAndroidInjector
     abstract PlayerService playerService();
 

app/src/main/java/com/nextcloud/client/jobs/AccountRemovalWork.kt

@@ -42,6 +42,7 @@ import com.owncloud.android.ui.activity.ManageAccountsActivity
 import com.owncloud.android.ui.events.AccountRemovedEvent
 import com.owncloud.android.utils.EncryptionUtils
 import com.owncloud.android.utils.PushUtils
+import com.owncloud.android.utils.CommonPushUtils
 import org.greenrobot.eventbus.EventBus
 import java.util.Optional
 
@@ -94,6 +95,7 @@ class AccountRemovalWork(
         )
         // unregister push notifications
         unregisterPushNotifications(context, user, arbitraryDataProvider)
+        unregisterWebPushNotifications(context, user)
 
         // remove pending account removal
         arbitraryDataProvider.deleteKeyForAccount(user.accountName, ManageAccountsActivity.PENDING_FOR_REMOVAL)
@@ -170,6 +172,13 @@ class AccountRemovalWork(
         }
     }
 
+    private fun unregisterWebPushNotifications(
+        context: Context,
+        user: User
+    ) {
+        CommonPushUtils.unregisterUnifiedPushForAccount(context, userAccountManager, user.toOwnCloudAccount())
+    }
+
     private fun removeSyncedFolders(context: Context, user: User, clock: Clock) {
         val syncedFolders = syncedFolderProvider.syncedFolders
         val syncedFolderIds: MutableList<Long> = ArrayList()

app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt

@@ -91,6 +91,7 @@ class BackgroundJobFactory @Inject constructor(
                 OfflineSyncWork::class -> createOfflineSyncWork(context, workerParameters)
                 MediaFoldersDetectionWork::class -> createMediaFoldersDetectionWork(context, workerParameters)
                 NotificationWork::class -> createNotificationWork(context, workerParameters)
+                UnifiedPushWork::class -> createUnifiedPushWork(context, workerParameters)
                 AccountRemovalWork::class -> createAccountRemovalWork(context, workerParameters)
                 CalendarBackupWork::class -> createCalendarBackupWork(context, workerParameters)
                 CalendarImportWork::class -> createCalendarImportWork(context, workerParameters)
@@ -215,6 +216,14 @@ class BackgroundJobFactory @Inject constructor(
         viewThemeUtils.get()
     )
 
+    private fun createUnifiedPushWork(context: Context, params: WorkerParameters): UnifiedPushWork = UnifiedPushWork(
+        context,
+        params,
+        accountManager,
+        preferences,
+        viewThemeUtils.get()
+    )
+
     private fun createAccountRemovalWork(context: Context, params: WorkerParameters): AccountRemovalWork =
         AccountRemovalWork(
             context,

app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManager.kt

@@ -134,6 +134,12 @@ interface BackgroundJobManager {
     fun startMediaFoldersDetectionJob()
 
     fun startNotificationJob(subject: String, signature: String)
+    fun startDecryptedNotificationJob(accountName: String, message: String)
+    fun registerWebPush(accountName: String, url: String, uaPublicKey: String, auth: String)
+    fun activateWebPush(accountName: String, token: String)
+    fun unregisterWebPush(accountName: String)
+    fun mayResetUnifiedPush()
+
     fun startAccountRemovalJob(accountName: String, remoteWipe: Boolean)
     fun startFilesUploadJob(user: User, uploadIds: LongArray, showSameFileAlreadyExistsNotification: Boolean)
     fun getFileUploads(user: User): LiveData<List<JobInfo>>