Merge remote-tracking branch 'origin/master' into dev

nextcloud · Sep 25, 2020 · ac08ef2 · ac08ef2
2 parents 1cadee3 + c781447
commit ac08ef2
Show file tree

Hide file tree

Showing 66 changed files with 1,793 additions and 1,145 deletions.
diff --git a/...oud.android.ui.fragment.FileDetailFragmentStaticServerIT_showDetailsSharing.png b/...oud.android.ui.fragment.FileDetailFragmentStaticServerIT_showDetailsSharing.png
diff --git a/....ui.fragment.FileDetailFragmentStaticServerIT_showFileDetailSharingFragment.png b/....ui.fragment.FileDetailFragmentStaticServerIT_showFileDetailSharingFragment.png
diff --git a/...android.ui.fragment.FileDetailSharingFragmentIT_listSharesFileAllShareTypes.png b/...android.ui.fragment.FileDetailSharingFragmentIT_listSharesFileAllShareTypes.png
diff --git a/...owncloud.android.ui.fragment.FileDetailSharingFragmentIT_listSharesFileNone.png b/...owncloud.android.ui.fragment.FileDetailSharingFragmentIT_listSharesFileNone.png
diff --git a/...d.ui.fragment.FileDetailSharingFragmentIT_listSharesFileResharingNotAllowed.png b/...d.ui.fragment.FileDetailSharingFragmentIT_listSharesFileResharingNotAllowed.png
diff --git a/...droid.ui.fragment.FileDetailSharingFragmentIT_listShares_file_allShareTypes.png b/...droid.ui.fragment.FileDetailSharingFragmentIT_listShares_file_allShareTypes.png
diff --git a/...ncloud.android.ui.fragment.FileDetailSharingFragmentIT_listShares_file_none.png b/...ncloud.android.ui.fragment.FileDetailSharingFragmentIT_listShares_file_none.png
diff --git a/....fragment.FileDetailSharingFragmentIT_listShares_file_resharing_not_allowed.png b/....fragment.FileDetailSharingFragmentIT_listShares_file_resharing_not_allowed.png
diff --git a/...cloud.android.ui.fragment.FileDetailSharingFragmentIT_publicLink_optionMenu.png b/...cloud.android.ui.fragment.FileDetailSharingFragmentIT_publicLink_optionMenu.png
diff --git a/scripts/analysis/findbugs-results.txt b/scripts/analysis/findbugs-results.txt
@@ -1 +1 @@
-320
+319
diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 81 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 80 warnings</span>
diff --git a/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java b/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java
@@ -97,7 +97,7 @@ public void showShares() {
                                                          "users",
                                                          false,
                                                          "",
-                                                         OCShare.DEFAULT_PERMISSION)
+                                                         OCShare.NO_PERMISSION)
                               .execute(client).isSuccess());
 
         // share folder to circle

diff --git a/src/androidTest/java/com/owncloud/android/AbstractIT.java b/src/androidTest/java/com/owncloud/android/AbstractIT.java
@@ -58,6 +58,7 @@
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static com.owncloud.android.lib.common.accounts.AccountUtils.Constants.KEY_USER_ID;
 import static org.junit.Assert.assertTrue;
 
 
@@ -96,7 +97,7 @@ public static void beforeAll() {
             Account temp = new Account("test@https://server.com", MainApp.getAccountType(targetContext));
             platformAccountManager.addAccountExplicitly(temp, "password", null);
             platformAccountManager.setUserData(temp, AccountUtils.Constants.KEY_OC_BASE_URL, "https://server.com");
-            platformAccountManager.setUserData(temp, AccountUtils.Constants.KEY_USER_ID, "test");
+            platformAccountManager.setUserData(temp, KEY_USER_ID, "test");
 
             final UserAccountManager userAccountManager = UserAccountManagerImpl.fromContext(targetContext);
             account = userAccountManager.getAccountByName("test@https://server.com");
@@ -381,4 +382,8 @@ private String createName() {
 
         return name;
     }
+
+    public static String getUserId(User user) {
+        return AccountManager.get(targetContext).getUserData(user.toPlatformAccount(), KEY_USER_ID);
+    }
 }
diff --git a/src/androidTest/java/com/owncloud/android/authentication/AuthenticatorActivityIT.kt b/src/androidTest/java/com/owncloud/android/authentication/AuthenticatorActivityIT.kt
@@ -32,6 +32,7 @@ class AuthenticatorActivityIT {
     }
 
     @Test
+    @Suppress("TooGenericExceptionCaught")
     fun tryCatch() {
         val color = try {
             Color.parseColor("1")
@@ -43,6 +44,7 @@ class AuthenticatorActivityIT {
     }
 
     @Test
+    @Suppress("TooGenericExceptionCaught")
     fun tryCatch2() {
         val color = try {
             Color.parseColor("")
@@ -54,6 +56,7 @@ class AuthenticatorActivityIT {
     }
 
     @Test
+    @Suppress("TooGenericExceptionCaught")
     fun tryCatch3() {
         val color = try {
             Color.parseColor(null)
@@ -65,6 +68,7 @@ class AuthenticatorActivityIT {
     }
 
     @Test
+    @Suppress("TooGenericExceptionCaught")
     fun tryCatch4() {
         val color = try {
             Color.parseColor("abc")

diff --git a/src/androidTest/java/com/owncloud/android/datamodel/OCFileUnitTest.java b/src/androidTest/java/com/owncloud/android/datamodel/OCFileUnitTest.java
@@ -88,7 +88,6 @@ public void writeThenReadAsParcelable() {
         mFile.setEtag(ETAG);
         mFile.setSharedViaLink(true);
         mFile.setSharedWithSharee(true);
-        mFile.setPublicLink(PUBLIC_LINK);
         mFile.setPermissions(PERMISSIONS);
         mFile.setRemoteId(REMOTE_ID);
         mFile.setUpdateThumbnailNeeded(true);
@@ -122,7 +121,6 @@ public void writeThenReadAsParcelable() {
         assertThat(fileReadFromParcel.getEtag(), is(ETAG));
         assertThat(fileReadFromParcel.isSharedViaLink(), is(true));
         assertThat(fileReadFromParcel.isSharedWithSharee(), is(true));
-        assertThat(fileReadFromParcel.getPublicLink(), is(PUBLIC_LINK));
         assertThat(fileReadFromParcel.getPermissions(), is(PERMISSIONS));
         assertThat(fileReadFromParcel.getRemoteId(), is(REMOTE_ID));
         assertThat(fileReadFromParcel.isUpdateThumbnailNeeded(), is(true));

diff --git a/src/androidTest/java/com/owncloud/android/ui/fragment/AvatarIT.kt b/src/androidTest/java/com/owncloud/android/ui/fragment/AvatarIT.kt
@@ -40,7 +40,7 @@ class AvatarIT : AbstractIT() {
     @ScreenshotTest
     fun showAvatars() {
         val avatarRadius = targetContext.resources.getDimension(R.dimen.list_item_avatar_icon_radius)
-        val width = DisplayUtils.convertDpToPixel(40f, targetContext)
+        val width = DisplayUtils.convertDpToPixel(2 * avatarRadius, targetContext)
         val sut = testActivityRule.launchActivity(null)
         val fragment = AvatarTestFragment()
 
@@ -56,6 +56,7 @@ class AvatarIT : AbstractIT() {
             fragment.addAvatar("email@server.com", avatarRadius, width, targetContext)
         }
 
+        shortSleep()
         waitForIdleSync()
         screenshot(sut)
     }

diff --git a/src/androidTest/java/com/owncloud/android/ui/fragment/AvatarTestFragment.kt b/src/androidTest/java/com/owncloud/android/ui/fragment/AvatarTestFragment.kt
@@ -45,7 +45,7 @@ internal class AvatarTestFragment : Fragment() {
     }
 
     fun addAvatar(name: String, avatarRadius: Float, width: Int, targetContext: Context) {
-        val margin = 10
+        val margin = padding
         val imageView = ImageView(targetContext)
         imageView.setImageDrawable(TextDrawable.createNamedAvatar(name, avatarRadius))
 
@@ -56,4 +56,8 @@ internal class AvatarTestFragment : Fragment() {
 
         list.addView(imageView)
     }
+
+    companion object {
+        private const val padding = 10
+    }
 }
diff --git a/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailFragmentStaticServerIT.kt b/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailFragmentStaticServerIT.kt
@@ -172,7 +172,7 @@ class FileDetailFragmentStaticServerIT : AbstractIT() {
 
     @Test
     @ScreenshotTest
-    fun showDetails_Sharing() {
+    fun showDetailsSharing() {
         val sut = testActivityRule.launchActivity(null)
         sut.addFragment(FileDetailFragment.newInstance(file, user, 1))