check shareType

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java

@@ -534,7 +534,7 @@ private void handleContactResult(@NonNull Uri contactUri) {
 
     private boolean containsNoNewPublicShare(List<OCShare> shares) {
         for (OCShare share : shares) {
-            if (share.getShareType() == ShareType.NEW_PUBLIC_LINK) {
+            if (share.getShareType() != null && share.getShareType() == ShareType.NEW_PUBLIC_LINK) {
                 return false;
             }
         }
@@ -550,7 +550,7 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
     }
 
     private boolean isReshareForbidden(OCShare share) {
-        return ShareType.FEDERATED == share.getShareType() ||
+        return (share.getShareType() != null && ShareType.FEDERATED == share.getShareType()) ||
                 capabilities != null && !capabilities.isReSharingAllowed();
     }
 

app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java

@@ -150,10 +150,12 @@ protected final void sortShares() {
         List<OCShare> users = new ArrayList<>();
 
         for (OCShare share : shares) {
-            if (ShareType.PUBLIC_LINK == share.getShareType() || ShareType.EMAIL == share.getShareType()) {
-                links.add(share);
-            } else if (share.getShareType() != ShareType.INTERNAL) {
-                users.add(share);
+            if (share.getShareType()  != null) {
+                if (ShareType.PUBLIC_LINK == share.getShareType() || ShareType.EMAIL == share.getShareType()) {
+                    links.add(share);
+                } else if (share.getShareType() != ShareType.INTERNAL) {
+                    users.add(share);
+                }
             }
         }
 

app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java

@@ -35,7 +35,7 @@ public LinkShareViewHolder(ItemShareLinkShareBinding binding, Context context) {
     }
 
     public void bind(OCShare publicShare, ShareeListAdapterListener listener) {
-        if (ShareType.EMAIL == publicShare.getShareType()) {
+        if (publicShare.getShareType() != null && ShareType.EMAIL == publicShare.getShareType()) {
             binding.name.setText(publicShare.getSharedWithDisplayName());
             binding.icon.setImageDrawable(ResourcesCompat.getDrawable(context.getResources(),
                     R.drawable.ic_email,

app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java

@@ -42,8 +42,12 @@ public void bind(OCShare share,
         String accountName = account.getDisplayName();
         String name = share.getSharedWithDisplayName();
         binding.icon.setTag(null);
+        final var shareType = share.getShareType();
+        if (shareType == null) {
+            return;
+        }
 
-        switch (share.getShareType()) {
+        switch (shareType) {
             case GROUP:
                 name = context.getString(R.string.share_group_clarification, name);
                 // viewThemeUtils.files.createAvatar(share.getShareType(), binding.icon, context);
@@ -74,6 +78,11 @@ public void bind(OCShare share,
 
         binding.name.setText(name);
 
+        if (accountName == null) {
+            binding.overflowMenu.setVisibility(View.GONE);
+            return;
+        }
+
         if (accountName.equalsIgnoreCase(share.getShareWith()) || accountName.equalsIgnoreCase(share.getUserId())) {
             binding.overflowMenu.setVisibility(View.VISIBLE);
 
@@ -99,7 +108,7 @@ private void setPermissionName(String permissionName) {
 
     private void setImage(ImageView avatar, String name, @DrawableRes int fallback) {
         try {
-            // avatar.setImageDrawable(TextDrawable.createNamedAvatar(name, avatarRadiusDimension));
+            AvatarLoader.INSTANCE.load(context, avatar, account);
         } catch (StringIndexOutOfBoundsException e) {
             avatar.setImageResource(fallback);
         }

app/src/main/java/it/niedermann/owncloud/notes/share/dialog/NoteShareActivityShareItemActionBottomSheetDialog.java

@@ -50,7 +50,7 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void updateUI() {
-        if (ocShare.getShareType() == ShareType.PUBLIC_LINK) {
+        if (ocShare.getShareType() != null && ocShare.getShareType() == ShareType.PUBLIC_LINK) {
             binding.menuShareAddAnotherLink.setVisibility(View.VISIBLE);
             binding.menuShareSendLink.setVisibility(View.VISIBLE);
         } else {

app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt

@@ -224,7 +224,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
             val response = call.execute()
             if (response.isSuccessful) {
 
-                if (share.shareType == ShareType.PUBLIC_LINK) {
+                if (share.shareType != null && share.shareType == ShareType.PUBLIC_LINK) {
                     note.setIsShared(false)
                     updateNote(note)
                 }