notification to v2

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

Author: tobiasKaminsky

.drone.yml

@@ -124,6 +124,9 @@ services:
       - 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 "git clone -b enh/collaborative-lock https://github.com/nextcloud/files_lock.git /var/www/html/apps/files_lock/"
       - su www-data -c "php /var/www/html/occ app:enable -f files_lock"
+      - su www-data -c "git clone -b master https://github.com/nextcloud/notifications.git /var/www/html/apps/notifications/"
+      - su www-data -c "php /var/www/html/occ app:enable notifications"
+      - su www-data -c "php /var/www/html/occ notification:generate 'test'"
       - /usr/local/bin/run.sh
 
 trigger:
@@ -215,6 +218,8 @@ services:
       - su www-data -c "php /var/www/html/occ app:enable password_policy"
       - su www-data -c "php /var/www/html/occ app:enable 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 app:enable notifications"
+      - su www-data -c "php /var/www/html/occ notification:generate 'test'"
       - /usr/local/bin/run.sh
 
 trigger:

library/src/androidTest/java/com/owncloud/android/lib/resources/notifications/GetNotificationsRemoteOperationIT.kt

@@ -0,0 +1,38 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2022 Tobias Kaminsky
+ * Copyright (C) 2022 Nextcloud GmbH
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+package com.owncloud.android.lib.resources.notifications
+
+import com.owncloud.android.AbstractIT
+import junit.framework.Assert.assertTrue
+import org.junit.Test
+
+class GetNotificationsRemoteOperationIT : AbstractIT() {
+    @Test
+    fun testNotifications() {
+        val result = nextcloudClient.execute(GetNotificationsRemoteOperation())
+        assertTrue(result.isSuccess)
+
+        val notifications = result.resultData
+
+        assertTrue(notifications.isNotEmpty())
+    }
+}

library/src/main/java/com/owncloud/android/lib/resources/notifications/GetNotificationsRemoteOperation.java

@@ -34,25 +34,25 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.reflect.TypeToken;
-import com.owncloud.android.lib.common.OwnCloudClient;
+import com.nextcloud.common.NextcloudClient;
+import com.nextcloud.operations.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.notifications.models.Notification;
 
 import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.json.JSONException;
 
 import java.lang.reflect.Type;
+import java.util.HashMap;
 import java.util.List;
 
 /**
  * Provides the remote notifications from the server handling the following data structure
  * accessible via the notifications endpoint at {@value OCS_ROUTE_LIST_V12_AND_UP}, specified at
  * {@link "https://github.com/nextcloud/notifications/blob/master/docs/ocs-endpoint-v2.md"}.
  */
-public class GetNotificationsRemoteOperation extends RemoteOperation {
+public class GetNotificationsRemoteOperation extends RemoteOperation<List<Notification>> {
 
     // OCS Route
     private static final String OCS_ROUTE_LIST_V12_AND_UP =
@@ -66,39 +66,38 @@ public class GetNotificationsRemoteOperation extends RemoteOperation {
     private static final String NODE_DATA = "data";
 
     @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
-        int status = -1;
+    public RemoteOperationResult<List<Notification>> run(NextcloudClient client) {
+        RemoteOperationResult<List<Notification>> result;
+        int status;
         GetMethod get = null;
         List<Notification> notifications;
         String url = client.getBaseUri() + OCS_ROUTE_LIST_V12_AND_UP;
 
         // get the notifications
         try {
-            get = new GetMethod(url);
-            get.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
+            get = new GetMethod(url, true);
+            HashMap<String, String> map = new HashMap<>();
+            map.put("format", "json");
+
+            get.setQueryString(map);
+            status = client.execute(get);
 
-            status = client.executeMethod(get);
             String response = get.getResponseBodyAsString();
 
             if (isSuccess(status)) {
-                result = new RemoteOperationResult(true, status, get.getResponseHeaders());
+                result = new RemoteOperationResult<>(true, get);
                 Log_OC.d(TAG, "Successful response: " + response);
 
                 // Parse the response
                 notifications = parseResult(response);
-                result.setNotificationData(notifications);
+                result.setResultData(notifications);
             } else {
-                result = new RemoteOperationResult(false, status, get.getResponseHeaders());
+                result = new RemoteOperationResult<>(false, get);
                 Log_OC.e(TAG, "Failed response while getting user notifications ");
-                if (response != null) {
-                    Log_OC.e(TAG, "*** status code: " + status + " ; response message: " + response);
-                } else {
-                    Log_OC.e(TAG, "*** status code: " + status);
-                }
+                Log_OC.e(TAG, "*** status code: " + status + " ; response message: " + response);
             }
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             Log_OC.e(TAG, "Exception while getting remote notifications", e);
         } finally {
             if (get != null) {
@@ -109,7 +108,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {
         return result;
     }
 
-    private List<Notification> parseResult(String response) throws JSONException {
+    private List<Notification> parseResult(String response) {
         JsonParser jsonParser = new JsonParser();
         JsonObject jo = (JsonObject)jsonParser.parse(response);
         JsonArray jsonDataArray = jo.getAsJsonObject(NODE_OCS).getAsJsonArray(NODE_DATA);