mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-21 04:29:45 +01:00
also show server address and placeholder avatar for account import
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
parent
43f57931fd
commit
a18987dc0a
@ -125,7 +125,12 @@ public class AdvancedUserItem extends AbstractFlexibleItem<AdvancedUserItem.User
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (userEntity != null && !TextUtils.isEmpty(userEntity.getBaseUrl())) {
|
if (userEntity != null && !TextUtils.isEmpty(userEntity.getBaseUrl())) {
|
||||||
holder.serverUrl.setText((Uri.parse(userEntity.getBaseUrl()).getHost()));
|
String host = Uri.parse(userEntity.getBaseUrl()).getHost();
|
||||||
|
if (!TextUtils.isEmpty(host)) {
|
||||||
|
holder.serverUrl.setText(Uri.parse(userEntity.getBaseUrl()).getHost());
|
||||||
|
} else {
|
||||||
|
holder.serverUrl.setText(userEntity.getBaseUrl());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
holder.avatarImageView.getHierarchy().setPlaceholderImage(R.drawable.account_circle_48dp);
|
holder.avatarImageView.getHierarchy().setPlaceholderImage(R.drawable.account_circle_48dp);
|
||||||
@ -134,17 +139,14 @@ public class AdvancedUserItem extends AbstractFlexibleItem<AdvancedUserItem.User
|
|||||||
if (userEntity != null && userEntity.getBaseUrl() != null &&
|
if (userEntity != null && userEntity.getBaseUrl() != null &&
|
||||||
userEntity.getBaseUrl().startsWith("http://") ||
|
userEntity.getBaseUrl().startsWith("http://") ||
|
||||||
userEntity.getBaseUrl().startsWith("https://")) {
|
userEntity.getBaseUrl().startsWith("https://")) {
|
||||||
holder.avatarImageView.setVisibility(View.VISIBLE);
|
|
||||||
|
|
||||||
DraweeController draweeController = Fresco.newDraweeControllerBuilder()
|
DraweeController draweeController = Fresco.newDraweeControllerBuilder()
|
||||||
.setOldController(holder.avatarImageView.getController())
|
.setOldController(holder.avatarImageView.getController())
|
||||||
.setAutoPlayAnimations(true)
|
.setAutoPlayAnimations(true)
|
||||||
.setImageRequest(DisplayUtils.getImageRequestForUrl(ApiUtils.getUrlForAvatarWithName(userEntity.getBaseUrl(),
|
.setImageRequest(DisplayUtils.getImageRequestForUrl(ApiUtils.getUrlForAvatarWithName(userEntity.getBaseUrl(),
|
||||||
participant.getActorId(), R.dimen.small_item_height), null))
|
participant.getActorId(), R.dimen.small_item_height), null))
|
||||||
.build();
|
.build();
|
||||||
holder.avatarImageView.setController(draweeController);
|
holder.avatarImageView.setController(draweeController);
|
||||||
} else {
|
|
||||||
holder.avatarImageView.setVisibility(View.GONE);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user