Skip to content

Show cached data in account detail view when server is not reachable #17464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 2 commits into from
Aug 12, 2026
+20 −7
Merged

Show cached data in account detail view when server is not reachable #17464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0eda3a
15236: show cached data in account detail view
daniele-verducci Aug 11, 2026
f819f1a
Merge branch 'master' into fix/15236-account-detail-page-empty
daniele-verducci Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions app/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,15 @@
import com.bumptech.glide.request.target.Target;
import com.bumptech.glide.request.transition.Transition;
import com.nextcloud.client.account.User;
import com.nextcloud.client.account.UserAccountManager;
import com.nextcloud.client.di.Injectable;
import com.nextcloud.client.preferences.AppPreferences;
import com.nextcloud.common.NextcloudClient;
import com.nextcloud.utils.GlideHelper;
import com.nextcloud.utils.extensions.BundleExtensionsKt;
import com.owncloud.android.R;
import com.owncloud.android.databinding.UserInfoLayoutBinding;
import com.owncloud.android.lib.common.OwnCloudAccount;
import com.owncloud.android.lib.common.OwnCloudClientFactory;
import com.owncloud.android.lib.common.UserInfo;
import com.owncloud.android.lib.common.accounts.AccountUtils;
Expand Down Expand Up @@ -125,9 +127,8 @@ public void onCreate(Bundle savedInstanceState) {
viewThemeUtils.files.themeActionBar(this, actionBar);
}

if (userInfo != null) {
populateUserInfoUi(userInfo);
} else {
populateUserInfoUi(userInfo);
if (userInfo == null) {
setMultiListLoadingMessage();
fetchAndSetData();
}
Expand Down Expand Up @@ -179,6 +180,7 @@ private void setErrorMessageForMultiList(String headline, String message, @Drawa
binding.emptyList.emptyListViewText.setText(message);
binding.emptyList.emptyListIcon.setImageResource(errorResource);

binding.emptyList.emptyListView.setVisibility(View.VISIBLE);
binding.emptyList.emptyListIcon.setVisibility(View.VISIBLE);
binding.emptyList.emptyListViewText.setVisibility(View.VISIBLE);
binding.userinfoList.setVisibility(View.GONE);
Expand Down Expand Up @@ -256,16 +258,26 @@ private void populateUserInfoUi(UserInfo userInfo) {
binding.userinfoIcon,
this);

if (!TextUtils.isEmpty(userInfo.getDisplayName())) {
if (userInfo != null && !TextUtils.isEmpty(userInfo.getDisplayName())) {
binding.userinfoFullName.setText(userInfo.getDisplayName());
} else {
try {
OwnCloudAccount oca = user.toOwnCloudAccount();
binding.userinfoFullName.setText(oca.getDisplayName());
} catch (Exception e) {
Log_OC.w(TAG, "Account not found right after being read; using account name instead");
binding.userinfoFullName.setText(UserAccountManager.getUsername(user));
}
}

if (userInfo == null)
return;

if (TextUtils.isEmpty(userInfo.getPhone()) && TextUtils.isEmpty(userInfo.getEmail())
&& TextUtils.isEmpty(userInfo.getAddress()) && TextUtils.isEmpty(userInfo.getTwitter())
&& TextUtils.isEmpty(userInfo.getWebsite())) {
binding.userinfoList.setVisibility(View.GONE);
binding.loadingContent.setVisibility(View.GONE);
binding.emptyList.emptyListView.setVisibility(View.VISIBLE);

setErrorMessageForMultiList(getString(R.string.userinfo_no_info_headline),
getString(R.string.userinfo_no_info_text), R.drawable.ic_user_outline);
Expand Down Expand Up @@ -347,10 +359,10 @@ private void fetchAndSetData() {
// show error
runOnUiThread(() -> setErrorMessageForMultiList(
getString(R.string.user_information_retrieval_error),
result.getLogMessage(this),
getString(R.string.user_information_retrieval_error_message),
R.drawable.ic_list_empty_error)
);
Log_OC.d(TAG, result.getLogMessage());
Log_OC.d(TAG, result.getLogMessage(this));
}
}
});
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,6 +847,7 @@
<string name="user_info_groups">Groups</string>

<string name="user_information_retrieval_error">Error retrieving user information</string>
<string name="user_information_retrieval_error_message">Please double check your internet connection or check server status</string>

<!-- Activities -->
<string name="activities_no_results_headline">No activity yet</string>
Expand Down
Loading