Fix some tests

owncloud · Aug 5, 2019 · 63e74e3 · 63e74e3
1 parent b2bbf26
commit 63e74e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/...c/androidTest/java/com/owncloud/android/shares/domain/publicShares/EditPublicShareTest.kt b/...c/androidTest/java/com/owncloud/android/shares/domain/publicShares/EditPublicShareTest.kt
@@ -325,7 +325,7 @@ class EditPublicShareTest {
         calendar.add(Calendar.DAY_OF_YEAR, 1)
         val formatter: DateFormat = SimpleDateFormat("MMM dd, yyyy");
         val expirationDate = formatter.format(calendar.time);
-        val publicLinkExpirationDateInMillis = SimpleDateFormat.getDateInstance().parse(expirationDate).time
+        val publicLinkExpirationDateInMillis = formatter.parse(expirationDate).time
 
         // 1. Open dialog to edit an existing public share
         onView(withId(R.id.editPublicLinkButton)).perform(click())

diff --git a/...dApp/src/main/java/com/owncloud/android/shares/presentation/fragment/ShareFileFragment.kt b/...dApp/src/main/java/com/owncloud/android/shares/presentation/fragment/ShareFileFragment.kt
@@ -184,8 +184,9 @@ class ShareFileFragment : Fragment(), ShareUserListAdapter.ShareUserAdapterListe
     /**
      * @return 'True' when public share is disabled in the server
      */
-    private val isPublicShareDisabled: Boolean
-        get() = capabilities?.filesSharingPublicEnabled == CapabilityBooleanType.FALSE.value
+    private val isPublicShareEnabled: Boolean
+        get() = capabilities?.filesSharingPublicEnabled == CapabilityBooleanType.TRUE.value ||
+                capabilities?.filesSharingPublicEnabled == CapabilityBooleanType.UNKNOWN.value
 
     /**
      * {@inheritDoc}
@@ -329,9 +330,7 @@ class ShareFileFragment : Fragment(), ShareUserListAdapter.ShareUserAdapterListe
         // Update view depending on updated capabilities
         shareHeaderDivider.isVisible = isShareApiEnabled
         shareWithUsersSection.isVisible = isShareApiEnabled
-        shareViaLinkSection.isVisible = isShareApiEnabled
-
-        shareViaLinkSection.isGone = isPublicShareDisabled
+        shareViaLinkSection.isVisible = isShareApiEnabled && isPublicShareEnabled
     }
 
     /**************************************************************************************************************