Merge pull request #751 from nextcloud/backport/638

[stable-2.8] Fix for failed logins / app crashes
nextcloud · Nov 9, 2021 · da770c2 · da770c2
2 parents d79116e + 8f5f260
commit da770c2
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/main/java/com/owncloud/android/lib/common/OwnCloudClientFactory.java b/src/main/java/com/owncloud/android/lib/common/OwnCloudClientFactory.java
@@ -35,12 +35,12 @@
 import android.os.Bundle;
 
 import com.nextcloud.common.NextcloudClient;
+import com.nextcloud.common.OkHttpCredentialsUtil;
 import com.owncloud.android.lib.common.accounts.AccountTypeUtils;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
 import com.owncloud.android.lib.common.network.NetworkUtils;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.nextcloud.common.OkHttpCredentialsUtil;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
@@ -206,9 +206,19 @@ public static NextcloudClient createNextcloudClient(Account account, Context app
         // TODO avoid calling to getUserData here
         String userId = am.getUserData(account, AccountUtils.Constants.KEY_USER_ID);
         String username = AccountUtils.getUsernameForAccount(account);
-        String password = am.peekAuthToken(account, AccountTypeUtils.getAuthTokenTypePass(account.type));
+        String password;
+        try {
+            password = am.blockingGetAuthToken(account, AccountTypeUtils.getAuthTokenTypePass(account.type), false);
+            if (password == null) {
+                Log_OC.e(TAG, "Error receiving password token (password==null)");
+                throw new AccountNotFoundException(account, "Error receiving password token (password==null)", null);
+            }
+        } catch (Exception e) {
+            Log_OC.e(TAG, "Error receiving password token", e);
+            throw new AccountNotFoundException(account, "Error receiving password token", e);
+        }
 
-        if (username == null || username.isEmpty() || password == null || password.isEmpty()) {
+        if (username == null || username.isEmpty() || password.isEmpty()) {
             throw new AccountNotFoundException(
                     account,
                     "Username or password could not be retrieved",