mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-28 18:28:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

check if account is null

Browse source 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
tobiasKaminsky 2018-03-21 13:42:55 +01:00
parent 9a97e436d8
commit b826fa4d9c
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
View file

@ -27,6 +27,7 @@ package com.owncloud.android.ui.activity;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.AccountManagerFuture;
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.graphics.drawable.ColorDrawable;
@ -946,9 +947,15 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
// set user space information
Thread t = new Thread(new Runnable() {
public void run() {
AccountManager mAccountMgr = AccountManager.get(MainApp.getAppContext());
Context context = MainApp.getAppContext();
AccountManager mAccountMgr = AccountManager.get(context);
Account account = AccountUtils.getCurrentOwnCloudAccount(context);
String userId = mAccountMgr.getUserData(AccountUtils.getCurrentOwnCloudAccount(DrawerActivity.this),
if (account == null) {
return;
}
String userId = mAccountMgr.getUserData(account,
com.owncloud.android.lib.common.accounts.AccountUtils.Constants.KEY_USER_ID);
RemoteOperation getQuotaInfoOperation;
@ -958,8 +965,7 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
getQuotaInfoOperation = new GetRemoteUserInfoOperation(userId);
}
RemoteOperationResult result = getQuotaInfoOperation.execute(
AccountUtils.getCurrentOwnCloudAccount(DrawerActivity.this), DrawerActivity.this);
RemoteOperationResult result = getQuotaInfoOperation.execute(account, context);
if (result.isSuccess() && result.getData() != null) {
final UserInfo userInfo = (UserInfo) result.getData().get(0);
@ -967,11 +973,9 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
// Since we always call this method, might as well put it here
if (userInfo.getId() != null) {
mAccountMgr.setUserData(
AccountUtils.getCurrentOwnCloudAccount(DrawerActivity.this),
mAccountMgr.setUserData(account,
com.owncloud.android.lib.common.accounts.AccountUtils.Constants.KEY_USER_ID,
userInfo.getId()
);
userInfo.getId());
}
if (quota != null) {