always show sharing tab, but if needed with "reshare not allowed"

tobiasKaminsky · tobiasKaminsky · commit dcf337673985 · 2019-02-15T10:39:26.000+01:00
Signed-off-by: tobiasKaminsky &lt;tobias@kaminsky.me&gt;
diff --git a/build.gradle b/build.gradle
@@ -210,9 +210,9 @@ dependencies {
     // dependencies for app building
     implementation 'androidx.multidex:multidex:2.0.1'
 //    implementation project('nextcloud-android-library')
-    genericImplementation 'com.github.nextcloud:android-library:getNote-SNAPSHOT'
-    gplayImplementation 'com.github.nextcloud:android-library:getNote-SNAPSHOT'
-    versionDevImplementation 'com.github.nextcloud:android-library:getNote-SNAPSHOT'
+    genericImplementation 'com.github.nextcloud:android-library:master-SNAPSHOT'
+    gplayImplementation 'com.github.nextcloud:android-library:master-SNAPSHOT'
+    versionDevImplementation 'com.github.nextcloud:android-library:master-SNAPSHOT'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
diff --git a/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -878,7 +878,7 @@ Drawable doAvatarInBackground() {
                 try {
                     return TextDrawable.createAvatar(mAccount.name, mAvatarRadius);
                 } catch (NoSuchAlgorithmException e) {
-                    e.printStackTrace();
+                    Log_OC.e(this, "Error creating avatar", e);
                 }
             }
 
diff --git a/src/main/java/com/owncloud/android/ui/adapter/FileDetailTabAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/FileDetailTabAdapter.java
@@ -71,6 +71,6 @@ public FileDetailActivitiesFragment getFileDetailActivitiesFragment() {
 
     @Override
     public int getCount() {
-        return file.canReshare() ? 2 : 1;
+        return 2;
     }
 }
diff --git a/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
@@ -311,7 +311,6 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
                 OCFileListItemViewHolder itemViewHolder = (OCFileListItemViewHolder) holder;
 
                 if (!TextUtils.isEmpty(file.getOwnerId()) && !mAccount.name.split("@")[0].equals(file.getOwnerId())) {
-
                     Resources resources = mContext.getResources();
                     itemViewHolder.sharedAvatar.setTag(file.getOwnerId());
                     DisplayUtils.setAvatar(mAccount, file.getOwnerId(), this,
@@ -526,25 +525,28 @@ public int getItemViewType(int position) {
 
     private void showShareIcon(OCFileListGridImageViewHolder gridViewHolder, OCFile file) {
         ImageView sharedIconView = gridViewHolder.shared;
-        sharedIconView.setVisibility(View.VISIBLE);
-
-        if (file.isSharedWithSharee() || file.isSharedWithMe()) {
-            sharedIconView.setImageResource(R.drawable.shared_via_users);
-            sharedIconView.setContentDescription(mContext.getString(R.string.shared_icon_shared));
-        } else if (file.isSharedViaLink()) {
-            sharedIconView.setImageResource(R.drawable.shared_via_link);
-            sharedIconView.setContentDescription(mContext.getString(R.string.shared_icon_shared_via_link));
-        } else {
-            sharedIconView.setImageResource(R.drawable.ic_unshared);
-            sharedIconView.setContentDescription(mContext.getString(R.string.shared_icon_share));
-        }
 
-        if (!TextUtils.isEmpty(file.getOwnerId()) && !mAccount.name.split("@")[0].equals(file.getOwnerId())) { // TODO refactor
-            sharedIconView.setOnClickListener(view -> ocFileListFragmentInterface.showShareDetailView(file));
+        if (gridViewHolder instanceof OCFileListItemViewHolder || file.getUnreadCommentsCount() == 0) {
+            sharedIconView.setVisibility(View.VISIBLE);
+
+            if (file.isSharedWithSharee() || file.isSharedWithMe()) {
+                sharedIconView.setImageResource(R.drawable.shared_via_users);
+                sharedIconView.setContentDescription(mContext.getString(R.string.shared_icon_shared));
+            } else if (file.isSharedViaLink()) {
+                sharedIconView.setImageResource(R.drawable.shared_via_link);
+                sharedIconView.setContentDescription(mContext.getString(R.string.shared_icon_shared_via_link));
+            } else {
+                sharedIconView.setImageResource(R.drawable.ic_unshared);
+                sharedIconView.setContentDescription(mContext.getString(R.string.shared_icon_share));
+            }
+            if (!TextUtils.isEmpty(file.getOwnerId()) && !mAccount.name.split("@")[0].equals(file.getOwnerId())) { // TODO refactor
+                sharedIconView.setOnClickListener(view -> ocFileListFragmentInterface.showShareDetailView(file));
+            } else {
+                sharedIconView.setOnClickListener(view -> ocFileListFragmentInterface.onShareIconClick(file));
+            }
         } else {
-            sharedIconView.setOnClickListener(view -> ocFileListFragmentInterface.onShareIconClick(file));
+            sharedIconView.setVisibility(View.GONE);
         }
-        // TODO     sharedIconView.setVisibility(View.GONE);
     }
 
     /**
@@ -757,7 +759,6 @@ public void avatarGenerated(Drawable avatarDrawable, Object callContext) {
 
     @Override
     public boolean shouldCallGeneratedCallback(String tag, Object callContext) {
-//        return ((ImageView) callContext).getTag().equals(tag);
         return false;
     }
 
diff --git a/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -293,10 +293,7 @@ private void setupViewPager() {
         tabLayout.removeAllTabs();
 
         tabLayout.addTab(tabLayout.newTab().setText(R.string.drawer_item_activities));
-
-        if (getFile().canReshare()) {
-            tabLayout.addTab(tabLayout.newTab().setText(R.string.share_dialog_title));
-        }
+        tabLayout.addTab(tabLayout.newTab().setText(R.string.share_dialog_title));
 
         tabLayout.setTabGravity(TabLayout.GRAVITY_FILL);
         tabLayout.setSelectedTabIndicatorColor(ThemeUtils.primaryAccentColor(getContext()));
diff --git a/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java b/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java
@@ -79,7 +79,6 @@ public class FileDetailSharingFragment extends Fragment implements UserListAdapt
 
     private static final String ARG_FILE = "FILE";
     private static final String ARG_ACCOUNT = "ACCOUNT";
-    private static final String TAG = FileDetailSharingFragment.class.getSimpleName();
 
     // to show share with users/groups info
     private List<OCShare> shares;
@@ -211,12 +210,18 @@ public void onAttach(Context context) {
     }
 
     private void setupView() {
-        setShareByLinkInfo(file.isSharedViaLink());
-        setShareWithUserInfo();
         setShareWithYou();
-        FileDetailSharingFragmentHelper.setupSearchView(
-            (SearchManager) fileDisplayActivity.getSystemService(Context.SEARCH_SERVICE), searchView,
-            fileDisplayActivity.getComponentName());
+
+        if (file.canReshare()) {
+            setShareByLinkInfo(file.isSharedViaLink());
+            setShareWithUserInfo();
+            FileDetailSharingFragmentHelper.setupSearchView(
+                (SearchManager) fileDisplayActivity.getSystemService(Context.SEARCH_SERVICE), searchView,
+                fileDisplayActivity.getComponentName());
+        } else {
+            searchView.setVisibility(View.GONE);
+            noList.setText(R.string.reshare_not_allowed);
+        }
     }
 
     /**
@@ -546,7 +551,7 @@ public void refreshCapabilitiesFromDB() {
      * Takes into account server capabilities before reading database.
      */
     public void refreshPublicShareFromDB() {
-        if (FileDetailSharingFragmentHelper.isPublicShareDisabled(capabilities)) {
+        if (FileDetailSharingFragmentHelper.isPublicShareDisabled(capabilities) || !file.canReshare()) {
             shareByLinkContainer.setVisibility(View.GONE);
         } else {
             // Get public share
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
@@ -863,4 +863,5 @@
     <string name="remove_push_notification">Remove</string>
     <string name="shared_avatar_desc">Avatar from shared user</string>
     <string name="shared_with_you_by">Shared with you by %1$s</string>
+    <string name="reshare_not_allowed">Resharing is not allowed</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -878,7 +878,7 @@ Drawable doAvatarInBackground() {`
`878`	`878`	`try {`
`879`	`879`	`return TextDrawable.createAvatar(mAccount.name, mAvatarRadius);`
`880`	`880`	`} catch (NoSuchAlgorithmException e) {`
`881`		`- e.printStackTrace();`
	`881`	`+ Log_OC.e(this, "Error creating avatar", e);`
`882`	`882`	`}`
`883`	`883`	`}`
`884`	`884`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,6 @@ public FileDetailActivitiesFragment getFileDetailActivitiesFragment() {`
`71`	`71`
`72`	`72`	`@Override`
`73`	`73`	`public int getCount() {`
`74`		`- return file.canReshare() ? 2 : 1;`
	`74`	`+ return 2;`
`75`	`75`	`}`
`76`	`76`	`}`