Merge branch '2716-main-notes' into 'main' (f4560967) · Commits · e / os / Notes

app/build.gradle

+2 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,8 @@ def buildDate = { ->

		def appMajor = 3
		def appMinor = 7
		def appPatch = 2
		def appVersionCode = 3007002
		def appPatch = 3
		def appVersionCode = 3007003

		android {
		compileSdkVersion 33

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ import it.niedermann.owncloud.notes.shared.account.ImportMurenaAccountViewModel;
		import it.niedermann.owncloud.notes.shared.account.LocalAccountBundle;
		import it.niedermann.owncloud.notes.shared.account.LocalAccountViewModel;
		import it.niedermann.owncloud.notes.shared.model.IResponseCallback;
		import it.niedermann.owncloud.notes.shared.util.AccountSyncUtil;
		import trikita.log.Log;

		public class ImportAccountActivity extends AppCompatActivity {
		@@ -138,7 +139,7 @@ public class ImportAccountActivity extends AppCompatActivity {
		runOnUiThread(() -> {
		Log.i(TAG, capabilities.toString());
		BrandingUtil.saveBrandColors(ImportAccountActivity.this, capabilities.getColor(), capabilities.getTextColor());
		finishActivity();
		finishActivity(false);
		});
		SyncWorker.update(ImportAccountActivity.this, PreferenceManager.getDefaultSharedPreferences(ImportAccountActivity.this)
		.getBoolean(getString(R.string.pref_key_background_sync), true));
		@@ -191,10 +192,11 @@ public class ImportAccountActivity extends AppCompatActivity {
		}
		}

		private void finishActivity() {
		private void finishActivity(boolean isLocal) {
		setResult(RESULT_OK);
		Intent intent = new Intent(ImportAccountActivity.this, MainActivity.class);
		intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP \| Intent.FLAG_ACTIVITY_NEW_TASK);
		intent.putExtra(AccountSyncUtil.LOCAL, isLocal);
		startActivity(intent);
		finish();
		}
		@@ -272,7 +274,7 @@ public class ImportAccountActivity extends AppCompatActivity {
		SingleAccountHelper.setCurrentAccount(getApplicationContext(), result.getSingleSignOnAccount().name);

		BrandingUtil.saveBrandColors(ImportAccountActivity.this, result.getCapabilities().getColor(), result.getCapabilities().getTextColor());
		finishActivity();
		finishActivity(true);
		});
		}
		}

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

+11 −1

Original line number	Diff line number	Diff line
		@@ -94,6 +94,7 @@ import it.niedermann.owncloud.notes.shared.model.CategorySortingMethod;
		import it.niedermann.owncloud.notes.shared.model.IResponseCallback;
		import it.niedermann.owncloud.notes.shared.model.NavigationCategory;
		import it.niedermann.owncloud.notes.shared.model.NoteClickListener;
		import it.niedermann.owncloud.notes.shared.util.AccountSyncUtil;
		import it.niedermann.owncloud.notes.shared.util.CustomAppGlideModule;
		import it.niedermann.owncloud.notes.shared.util.DisplayUtils;
		import it.niedermann.owncloud.notes.shared.util.NoteUtil;
		@@ -164,7 +165,16 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A
		setupNotesList();

		mainViewModel.getAccounts$().observe(this, (accounts) -> {
		if (accounts.isEmpty() \|\| importMurenaAccountViewModel.shouldLoadMurenaAccount(accounts)) {
		Intent mainIntent = getIntent();
		boolean isLocalAccount = mainIntent != null &&
		mainIntent.getBooleanExtra(AccountSyncUtil.LOCAL, false);

		// Import the Murena account depending on what the user pressed in ImportAccountActivity.
		// If the user wants a local account, then avoid the loop of adding the account again.
		boolean importMurenaAccount = !isLocalAccount &&
		importMurenaAccountViewModel.shouldLoadMurenaAccount(accounts);

		if (accounts.isEmpty() \|\| importMurenaAccount) {
		Intent intent = new Intent(this, ImportAccountActivity.class);
		intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP \| Intent.FLAG_ACTIVITY_NEW_TASK);
		startActivity(intent);

app/src/main/java/it/niedermann/owncloud/notes/shared/util/AccountSyncUtil.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,8 @@ public final class AccountSyncUtil {

		private static final String TAG = AccountSyncUtil.class.getSimpleName();

		public static final String LOCAL = "Local";

		private AccountSyncUtil() {
		throw new UnsupportedOperationException("Do not instantiate this util class.");
		}