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

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

Fix importAccount page navigation issue

parent 0b459be7

app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java

+5 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ package it.niedermann.owncloud.notes.importaccount; 
import android.accounts.NetworkErrorException;

import android.content.Intent;

import android.os.Bundle;



import it.niedermann.owncloud.notes.main.MainActivity;

import trikita.log.Log;

import android.view.View;
@@ -118,6 +120,9 @@ public class ImportAccountActivity extends AppCompatActivity { 
                                    Log.i(TAG, capabilities.toString());

                                    BrandingUtil.saveBrandColors(ImportAccountActivity.this, capabilities.getColor(), capabilities.getTextColor());

                                    setResult(RESULT_OK);

                                    Intent intent = new Intent(ImportAccountActivity.this, MainActivity.class);

                                    intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);

                                    startActivity(intent);

                                    finish();

                                });

                                SyncWorker.update(ImportAccountActivity.this, PreferenceManager.getDefaultSharedPreferences(ImportAccountActivity.this)

app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java

+4 −1
Original line number Diff line number Diff line
@@ -167,7 +167,10 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A 


        mainViewModel.getAccounts$().observe(this, (accounts) -> {

            if (accounts.isEmpty() || importMurenaAccountViewModel.shouldLoadMurenaAccount(accounts)) {

                startActivityForResult(new Intent(this, ImportAccountActivity.class), ImportAccountActivity.REQUEST_CODE_IMPORT_ACCOUNT);

                Intent intent = new Intent(this, ImportAccountActivity.class);

                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);

                startActivity(intent);

                finish();

            } else {

                executor.submit(() -> {

                    try {