浏览代码

Merge pull request #1423 from nextcloud/bugfix/1422/baseUrlNull

Only parse baseURl if not empty
Andy Scherzinger 3 年之前
父节点
当前提交
a644fa9e7b
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java

+ 4 - 1
app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java

@@ -22,6 +22,7 @@ package com.nextcloud.talk.adapters.items;
 
 import android.accounts.Account;
 import android.net.Uri;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -123,7 +124,9 @@ public class AdvancedUserItem extends AbstractFlexibleItem<AdvancedUserItem.User
             holder.contactDisplayName.setText(participant.getDisplayName());
         }
 
-        holder.serverUrl.setText((Uri.parse(userEntity.getBaseUrl()).getHost()));
+        if (userEntity != null && !TextUtils.isEmpty(userEntity.getBaseUrl())) {
+            holder.serverUrl.setText((Uri.parse(userEntity.getBaseUrl()).getHost()));
+        }
 
         holder.avatarImageView.getHierarchy().setPlaceholderImage(R.drawable.account_circle_48dp);
         holder.avatarImageView.getHierarchy().setFailureImage(R.drawable.account_circle_48dp);