Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb6b9765 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '6765-fix_account_switch_break_functionality_issue' into 'main' 

6765-fix_account_switch_break_functionality_issue

See merge request !225
parents 8af36be7 03eda4cc

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

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import foundation.e.drive.services.InitializerService; 
import foundation.e.drive.services.ObserverService;

import foundation.e.drive.services.SynchronizationService;

import foundation.e.drive.utils.AppConstants;

import foundation.e.drive.utils.DavClientProvider;

import foundation.e.drive.utils.ViewUtils;

import timber.log.Timber;
@@ -54,6 +55,8 @@ public class AccountRemoveCallbackReceiver extends BroadcastReceiver { 
        cleanSharedPreferences(applicationContext, preferences);

        removeCachedFiles(applicationContext);



        DavClientProvider.getInstance().cleanUp();



        ViewUtils.updateWidgetView(applicationContext);

    }

app/src/main/java/foundation/e/drive/services/InitializerService.java

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import java.util.List; 
import foundation.e.drive.models.SyncedFolder;

import foundation.e.drive.utils.AppConstants;

import foundation.e.drive.utils.CommonUtils;

import foundation.e.drive.utils.DavClientProvider;

import foundation.e.drive.utils.RootSyncedFolderProvider;

import timber.log.Timber;
@@ -48,6 +49,7 @@ public class InitializerService extends Service { 
    @Override

    public int onStartCommand(@NonNull Intent intent, int flags, int startId) {

        Timber.i("onStartCommand()");

        DavClientProvider.getInstance().cleanUp();

        CommonUtils.setServiceUnCaughtExceptionHandler(this);



        //Get account

app/src/main/java/foundation/e/drive/utils/DavClientProvider.java

+5 −0
Original line number Diff line number Diff line
@@ -90,6 +90,11 @@ public class DavClientProvider { 
        return ncClientInstance;

    }



    public void cleanUp() {

        ncClientInstance = null;

        ocClientInstance = null;

    }



    @Nullable

    private static String getAcountPwd(Account account, Context ctx) throws AccountUtils.AccountNotFoundException {

        return AccountManager.get(ctx).getPassword(account);