Skip to content

Commit a2eb1af

Browse files
Merge pull request #290 from nextcloud/201_fixExpandableUploadListAdapter
Fix NPE in ExpandableUploadListAdapter...setText
2 parents 8bd58a2 + e6ba8a7 commit a2eb1af

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,14 @@ private View getView(OCUpload[] uploadsItems, int position, View convertView, Vi
243243

244244
TextView accountNameTextView = (TextView) view.findViewById(R.id.upload_account);
245245
Account account = AccountUtils.getOwnCloudAccountByName(mParentActivity, upload.getAccountName());
246-
accountNameTextView.setText(
247-
DisplayUtils.getAccountNameDisplayText(
248-
mParentActivity, account, account.name, upload.getAccountName())
249-
);
246+
if (account != null) {
247+
accountNameTextView.setText(
248+
DisplayUtils.getAccountNameDisplayText(
249+
mParentActivity, account, account.name, upload.getAccountName())
250+
);
251+
} else {
252+
accountNameTextView.setText(upload.getAccountName());
253+
}
250254

251255
TextView statusTextView = (TextView) view.findViewById(R.id.upload_status);
252256

0 commit comments

Comments
 (0)