wip

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

Author: tobiasKaminsky

.drone.yml

@@ -82,11 +82,7 @@ services:
       - su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/password_policy.git /var/www/html/apps/password_policy/"
       - su www-data -c "php /var/www/html/occ app:enable password_policy"
       - su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/external.git /var/www/html/apps/external/"
-      - su www-data -c 'php /var/www/html/occ config:app:set external sites --value="{\"1\":{\"id\":1,\"name
-        \":\"Nextcloud\",\"url\":\"https:\/\/www.nextcloud.com\",\"lang\":\"\",\"type\":\"link\",\"device\":\"\",
-        \"icon\":\"external.svg\",\"groups\":[],\"redirect\":false},\"2\":{\"id\":2,\"name\":\"Forum\",\"url
-        \":\"https:\/\/help.nextcloud.com\",\"lang\":\"\",\"type\":\"link\",\"device\":\"\",\"icon
-        \":\"external.svg\",\"groups\":[],\"redirect\":false}}"'
+      - su www-data -c 'php /var/www/html/occ config:app:set external sites --value="{\"1\":{\"id\":1,\"name\":\"Nextcloud\",\"url\":\"https:\/\/www.nextcloud.com\",\"lang\":\"\",\"type\":\"link\",\"device\":\"\",\"icon\":\"external.svg\",\"groups\":[],\"redirect\":false},\"2\":{\"id\":2,\"name\":\"Forum\",\"url\":\"https:\/\/help.nextcloud.com\",\"lang\":\"\",\"type\":\"link\",\"device\":\"\",\"icon\":\"external.svg\",\"groups\":[],\"redirect\":false}}"'
       - su www-data -c "php /var/www/html/occ app:enable external"
       - /run.sh
 

library/src/androidTest/java/com/owncloud/android/FileIT.java

@@ -37,6 +37,7 @@
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.lib.resources.shares.ShareeUser;
+import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
 import org.junit.Test;
 
@@ -162,6 +163,8 @@ public void testShareViaLinkSharees() {
 
     @Test
     public void testShareToGroupSharees() {
+        onlyOnMin(OwnCloudVersion.nextcloud_17);
+
         // create & verify folder
         String path = "/testFolder/";
         assertTrue(new CreateFolderRemoteOperation(path, true).execute(client).isSuccess());
@@ -171,7 +174,7 @@ public void testShareToGroupSharees() {
 
         // share folder
         assertTrue(new CreateShareRemoteOperation(path,
-                                                  ShareType.GROUP,
+                ShareType.GROUP,
                                                   "users",
                                                   false,
                                                   "",
@@ -197,6 +200,8 @@ public void testShareToGroupSharees() {
 
     @Test
     public void testOneSharees() {
+        onlyOnMin(OwnCloudVersion.nextcloud_17);
+
         // create & verify folder
         String path = "/testFolder/";
         assertTrue(new CreateFolderRemoteOperation(path, true).execute(client).isSuccess());
@@ -206,7 +211,7 @@ public void testOneSharees() {
 
         // share folder
         assertTrue(new CreateShareRemoteOperation(path,
-                                                  ShareType.USER,
+                ShareType.USER,
                                                   "user1",
                                                   false,
                                                   "",
@@ -232,6 +237,8 @@ public void testOneSharees() {
 
     @Test
     public void testTwoShareesOnParent() {
+        onlyOnMin(OwnCloudVersion.nextcloud_17);
+
         // create & verify folder
         String path = "/testFolder/";
         assertTrue(new CreateFolderRemoteOperation(path, true).execute(client).isSuccess());
@@ -280,6 +287,8 @@ public void testTwoShareesOnParent() {
 
     @Test
     public void testTwoSharees() {
+        onlyOnMin(OwnCloudVersion.nextcloud_17);
+
         // create & verify folder
         String path = "/testFolder/";
         assertTrue(new CreateFolderRemoteOperation(path, true).execute(client).isSuccess());