Additional logging for writing settings(#59), WIP: investigating prob…

…lem with HEAD request in SSO API
0xf104a · Nov 10, 2023 · fa249bb · fa249bb
1 parent 4e72dd7
commit fa249bb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/app/src/main/java/com/polar/nextcloudservices/API/NextcloudSSOAPI.java b/app/src/main/java/com/polar/nextcloudservices/API/NextcloudSSOAPI.java
@@ -48,6 +48,7 @@ public void onConnected() {
 
             @Override
             public void onError(Exception ex) {
+                Log.e(TAG, "Exception in Nextcloud API");
                 ex.printStackTrace();
             }
         };
@@ -68,7 +69,8 @@ public JSONObject getNotifications(PollUpdateListener service) {
                 .build();
         StringBuilder buffer = new StringBuilder();
         try {
-            BufferedReader in = new BufferedReader(new InputStreamReader(API.performNetworkRequest(request)));
+            BufferedReader in = new BufferedReader(
+                    new InputStreamReader(API.performNetworkRequestV2(request).getBody()));
             String line;
             while ((line = in.readLine()) != null) {
                 buffer.append(line);
@@ -170,11 +172,13 @@ public void sendAction(String link, String method) throws Exception {
 
     @Override
     public boolean checkNewNotifications() throws Exception {
-        NextcloudRequest request = new NextcloudRequest.Builder().setMethod("HEAD")
+        NextcloudRequest request = new NextcloudRequest.Builder().setMethod("GET")
                 .setUrl(Uri.encode("/ocs/v2.php/apps/notifications/api/v2/notifications", "/"))
                 .build();
         Response response = API.performNetworkRequestV2(request);
-        String lastEtag = Objects.requireNonNull(response.getPlainHeader("ETag")).toString();
+        String lastEtag = Objects.requireNonNull(response.getPlainHeader("ETag")).getValue();
+        Log.d(TAG, "lastETag=" + lastEtag);
+        Log.d(TAG, "mETag=" + mETag);
         if(!lastEtag.equals(mETag)){
             Log.d(TAG, "New notifications found");
             mETag = lastEtag;

diff --git a/app/src/main/java/com/polar/nextcloudservices/Services/NotificationService.java b/app/src/main/java/com/polar/nextcloudservices/Services/NotificationService.java
@@ -32,9 +32,11 @@ class PollTask extends AsyncTask<NotificationService, Void, JSONObject> {
     private static final String TAG = "NotificationService.PollTask";
     @Override
     protected JSONObject doInBackground(NotificationService... services) {
+        Log.d(TAG, "Checking notifications");
         NextcloudAbstractAPI api = services[0].getAPI();
         try {
-            if(api.checkNewNotifications()) {
+            boolean hasNotifications = api.checkNewNotifications();
+            if(hasNotifications) {
                 return api.getNotifications(services[0]);
             }
         } catch (Exception e) {