From 3be553c78e85b6154424478c440dab22f2678b04 Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Mon, 5 Sep 2022 18:51:26 +0530
Subject: [PATCH 1/2] eDrive: Fix userId being null

 * earlier userId could have been null due to various reasons
   so now directly fetch the saved id.
---
 .../java/foundation/e/drive/work/AccountUserInfoWorker.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/foundation/e/drive/work/AccountUserInfoWorker.java b/app/src/main/java/foundation/e/drive/work/AccountUserInfoWorker.java
index d027aaac..957d5eeb 100644
--- a/app/src/main/java/foundation/e/drive/work/AccountUserInfoWorker.java
+++ b/app/src/main/java/foundation/e/drive/work/AccountUserInfoWorker.java
@@ -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,10 +97,10 @@ 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");
+                Log.v(TAG, "UserId "+ userId +" saved for account");
             }
             final Quota userQuota = userInfo.getQuota();
             final double relativeQuota = userQuota.getRelative();
@@ -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 = "";
-- 
GitLab


From 8f2fcf6c7bb664221b523bc5524199520a118e28 Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Fri, 22 Apr 2022 18:47:24 +0530
Subject: [PATCH 2/2] eDrive: Sign debug app with test keys

---
 app/build.gradle           |  14 ++++++++++++++
 keystore/platform.keystore | Bin 0 -> 2899 bytes
 2 files changed, 14 insertions(+)
 create mode 100644 keystore/platform.keystore

diff --git a/app/build.gradle b/app/build.gradle
index bbcd73a2..1199d219 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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
+        }
     }
 
 
diff --git a/keystore/platform.keystore b/keystore/platform.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..574b2203d6dc78b3853cf899c3c7a1f60c773507
GIT binary patch
literal 2899
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
Twnw-)Emz)L9?8Va*tP%w2@*;x

literal 0
HcmV?d00001

-- 
GitLab