Merge branch '1897-Enable_session_cookie_sharing_on_dav_requests' into 'main' (232c08b7) · Commits · e / os / eDrive

app/build.gradle

+1 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ android {
		}

		dependencies {
		implementation 'com.github.nextcloud:android-library:2.13.0'
		implementation 'foundation.e:Nextcloud-Android-Library:1.0.5-release'
		implementation "commons-httpclient:commons-httpclient:3.1@jar"
		implementation fileTree(include: ['*.jar'], dir: 'libs')
		api 'androidx.annotation:annotation:1.6.0'

app/src/main/java/foundation/e/drive/account/AccountUserInfoWorker.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ public class AccountUserInfoWorker extends Worker {
		.diskCacheStrategy(DiskCacheStrategy.ALL)
		.preload();
		ViewUtils.updateWidgetView(mContext);
		DavClientProvider.getInstance().saveAccounts(mContext);
		return Result.success();
		} else {
		return Result.retry();
		@@ -235,6 +236,9 @@ public class AccountUserInfoWorker extends Worker {
		}
		accountManager.setUserData(account, ACCOUNT_DATA_ALIAS_KEY, aliases);
		Timber.d("fetchAliases(): success");

		DavClientProvider.getInstance().saveAccounts(mContext);

		return true;
		}
		}

app/src/main/java/foundation/e/drive/account/receivers/AccountAddedReceiver.kt

+3 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ import foundation.e.drive.R
		import foundation.e.drive.utils.AccountUtils
		import foundation.e.drive.utils.AppConstants
		import foundation.e.drive.utils.CommonUtils
		import foundation.e.drive.utils.DavClientProvider
		import foundation.e.drive.utils.WorkerUtils
		import timber.log.Timber

		@@ -44,6 +45,7 @@ class AccountAddedReceiver() : BroadcastReceiver() {
		.putString(AccountManager.KEY_ACCOUNT_NAME, accountName)
		.apply()

		DavClientProvider.getInstance().cleanUp();
		WorkerUtils.registerSetupWorkers(context)
		}

		@@ -73,7 +75,7 @@ class AccountAddedReceiver() : BroadcastReceiver() {
		}

		if (!isExistingAccount(accountName, accountType, context)) {
		Timber.w("No account exist for username: %s ", accountType, accountName)
		Timber.w("No account exist for type: %s, username: %s", accountType, accountName)
		return false
		}
		return true

app/src/main/java/foundation/e/drive/account/receivers/AccountRemoveCallbackReceiver.java

+4 −9

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@ import static foundation.e.drive.utils.AppConstants.SETUP_COMPLETED;

		import android.accounts.AccountManager;
		import android.annotation.SuppressLint;
		import android.app.Application;
		import android.app.NotificationManager;
		import android.content.BroadcastReceiver;
		import android.content.Context;
		@@ -25,11 +26,10 @@ import androidx.work.WorkManager;

		import java.io.File;

		import foundation.e.drive.EdriveApplication;
		import foundation.e.drive.R;
		import foundation.e.drive.database.DbHelper;
		import foundation.e.drive.database.FailedSyncPrefsManager;
		import foundation.e.drive.synchronization.SyncWorker;
		import foundation.e.drive.synchronization.SyncProxy;
		import foundation.e.drive.utils.AppConstants;
		import foundation.e.drive.utils.DavClientProvider;
		import foundation.e.drive.utils.ViewUtils;
		@@ -51,11 +51,12 @@ public class AccountRemoveCallbackReceiver extends BroadcastReceiver {
		}

		cancelWorkers(applicationContext);
		stopRecursiveFileObserver(applicationContext);
		SyncProxy.INSTANCE.moveToIdle((Application) applicationContext);
		deleteDatabase(applicationContext);
		cleanSharedPreferences(applicationContext, preferences);
		removeCachedFiles(applicationContext);
		deleteNotificationChannels(applicationContext);

		DavClientProvider.getInstance().cleanUp();

		ViewUtils.updateWidgetView(applicationContext);
		@@ -72,12 +73,6 @@ public class AccountRemoveCallbackReceiver extends BroadcastReceiver {
		Timber.d("Remove Database: %s", result);
		}

		private void stopRecursiveFileObserver(@NonNull Context applicationContext) {
		if (applicationContext instanceof EdriveApplication) {
		((EdriveApplication) applicationContext).stopRecursiveFileObserver();
		}
		}

		private boolean shouldProceedWithRemoval(@NonNull Intent intent, @NonNull SharedPreferences preferences, @NonNull Context context) {
		if (isInvalidAction(intent) \|\| intent.getExtras() == null) {
		Timber.w("Invalid account removal request");

app/src/main/java/foundation/e/drive/account/setup/RootFolderSetupWorker.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,9 @@ public class RootFolderSetupWorker extends Worker {
		new CreateFolderRemoteOperation(syncedFolder.getRemoteFolder(), true);

		@SuppressWarnings("deprecation") final RemoteOperationResult result = mkcolRequest.execute(client);

		DavClientProvider.getInstance().saveAccounts(context);

		if (result.isSuccess() \|\| result.getCode() == RemoteOperationResult.ResultCode.FOLDER_ALREADY_EXISTS) {
		DbHelper.insertSyncedFolder(syncedFolder, context);
		return Result.success();