Merge branch '5988-main-alias_broken' into 'v1-oreo' (b12128c7) · Commits · e / os / eDrive

app/build.gradle

+14 −0

Original line number	Diff line number	Diff line
		@@ -33,11 +33,25 @@ android {
		setProperty("archivesBaseName", "eDrive-$versionName")
		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
		}

		signingConfigs {
		debugConfig {
		storeFile file("../keystore/platform.keystore")
		storePassword 'android'
		keyAlias 'platform'
		keyPassword 'android'
		}
		}

		buildTypes {
		release {
		minifyEnabled false
		proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
		}

		debug {
		signingConfig signingConfigs.debugConfig
		}
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -61,7 +61,6 @@ public class AccountUserInfoWorker extends Worker {

		private final Context mContext;
		private Account account;
		private String userId;

		public AccountUserInfoWorker(@NonNull Context context, @NonNull WorkerParameters workerParams) {
		super(context, workerParams);
		@@ -98,7 +97,7 @@ public class AccountUserInfoWorker extends Worker {
		final UserInfo userInfo = ocsResult.getResultData();

		if (accountManager.getUserData(account, ACCOUNT_USER_ID_KEY) == null) {
		userId = userInfo.getId();
		final String userId = userInfo.getId();
		client.setUserId(userId);
		AccountManager.get(mContext).setUserData(account, ACCOUNT_USER_ID_KEY, userId);
		Log.v(TAG, "UserId "+ userId +" saved for account");
		@@ -185,6 +184,7 @@ public class AccountUserInfoWorker extends Worker {

		private boolean fetchAliases() {
		final OwnCloudClient ocClient = DavClientProvider.getInstance().getClientInstance(account, mContext);
		final String userId = accountManager.getUserData(account, ACCOUNT_USER_ID_KEY);
		final GetAliasOperation getAliasOperation = new GetAliasOperation(userId);
		final RemoteOperationResult<ArrayList<String>> ocsResult = getAliasOperation.execute(ocClient);
		String aliases = "";

0 → 100644

+2.83 KiB

File added.

No diff preview for this file type.