Merge pull request #408 from nextcloud/fixSSO0.6.0-rc60.6.0

Fix QueryParam

5 files changed, 31 insertions, 27 deletions

diff --git a/lib/src/main/java/com/nextcloud/android/sso/api/QueryParam.java b/lib/src/main/java/com/nextcloud/android/sso/QueryParam.java
index 8333949..edaa74f 100644
--- a/lib/src/main/java/com/nextcloud/android/sso/api/QueryParam.java
+++ b/lib/src/main/java/com/nextcloud/android/sso/QueryParam.java
@@ -1,10 +1,14 @@
-package com.nextcloud.android.sso.api;
+package com.nextcloud.android.sso;
+
+import java.io.Serializable;
 
 import androidx.annotation.Nullable;
 
-import java.io.Serializable;
 
 public class QueryParam implements Serializable {
+
+    private static final long serialVersionUID = 21523240203234211L; //assign a long value
+
     public String key;
     public String value;
 
diff --git a/lib/src/main/java/com/nextcloud/android/sso/aidl/NextcloudRequest.java b/lib/src/main/java/com/nextcloud/android/sso/aidl/NextcloudRequest.java
index 403da6d..2804c1b 100644
--- a/lib/src/main/java/com/nextcloud/android/sso/aidl/NextcloudRequest.java
+++ b/lib/src/main/java/com/nextcloud/android/sso/aidl/NextcloudRequest.java
@@ -20,10 +20,7 @@
 package com.nextcloud.android.sso.aidl;
 
 
-import androidx.core.util.ObjectsCompat;
-import androidx.core.util.Pair;
-
-import com.nextcloud.android.sso.api.QueryParam;
+import com.nextcloud.android.sso.QueryParam;
 
 import java.io.InputStream;
 import java.io.Serializable;
@@ -34,6 +31,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import androidx.core.util.ObjectsCompat;
+import androidx.core.util.Pair;
 import lombok.ToString;
 
 @ToString
diff --git a/lib/src/main/java/com/nextcloud/android/sso/api/NextcloudRetrofitServiceMethod.java b/lib/src/main/java/com/nextcloud/android/sso/api/NextcloudRetrofitServiceMethod.java
index ba46140..7361779 100644
--- a/lib/src/main/java/com/nextcloud/android/sso/api/NextcloudRetrofitServiceMethod.java
+++ b/lib/src/main/java/com/nextcloud/android/sso/api/NextcloudRetrofitServiceMethod.java
@@ -2,9 +2,7 @@ package com.nextcloud.android.sso.api;
 
 import android.util.Log;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
+import com.nextcloud.android.sso.QueryParam;
 import com.nextcloud.android.sso.aidl.NextcloudRequest;
 import com.nextcloud.android.sso.helper.Okhttp3Helper;
 import com.nextcloud.android.sso.helper.ReactivexHelper;
@@ -27,6 +25,8 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.reactivex.Completable;
 import io.reactivex.Observable;
 import okhttp3.Headers;
diff --git a/lib/src/test/java/com/nextcloud/android/sso/api/TestRetrofitAPI.java b/lib/src/test/java/com/nextcloud/android/sso/api/TestRetrofitAPI.java
index 2524e74..b50edcb 100644
--- a/lib/src/test/java/com/nextcloud/android/sso/api/TestRetrofitAPI.java
+++ b/lib/src/test/java/com/nextcloud/android/sso/api/TestRetrofitAPI.java
@@ -1,17 +1,8 @@
 package com.nextcloud.android.sso.api;
 
-import static junit.framework.TestCase.assertTrue;
-import static junit.framework.TestCase.fail;
-import static org.junit.Assert.assertNotEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.lenient;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nextcloud.android.sso.QueryParam;
 import com.nextcloud.android.sso.aidl.NextcloudRequest;
 
 import org.junit.Before;
@@ -38,14 +29,24 @@ import retrofit2.Callback;
 import retrofit2.NextcloudRetrofitApiBuilder;
 import retrofit2.Response;
 
+import static junit.framework.TestCase.assertTrue;
+import static junit.framework.TestCase.fail;
+import static org.junit.Assert.assertNotEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 public class TestRetrofitAPI {
 
     /**
-     Allowed methods:
-     GET, POST, PUT, DELETE
-
-     Unsupported Methods:
-     PATCH, …
+     * Allowed methods:
+     * GET, POST, PUT, DELETE
+     * <p>
+     * Unsupported Methods:
+     * PATCH, …
      **/
 
     private final String mApiEndpoint = "/index.php/apps/news/api/v1-2/";
diff --git a/sample/src/main/java/com/nextcloud/android/sso/sample/MainActivity.java b/sample/src/main/java/com/nextcloud/android/sso/sample/MainActivity.java
index 3436da2..aeadd4a 100644
--- a/sample/src/main/java/com/nextcloud/android/sso/sample/MainActivity.java
+++ b/sample/src/main/java/com/nextcloud/android/sso/sample/MainActivity.java
@@ -34,7 +34,6 @@ import com.nextcloud.android.sso.exceptions.AccountImportCancelledException;
 import com.nextcloud.android.sso.exceptions.AndroidGetAccountsPermissionNotGranted;
 import com.nextcloud.android.sso.exceptions.NextcloudFilesAppNotInstalledException;
 
-import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -94,7 +93,8 @@ public class MainActivity extends AppCompatActivity {
                                         serverInfo.capabilities.theming.name,
                                         serverInfo.version.semanticVersion))
                         );
-                    } catch (IOException e) {
+                    } catch (Exception e) {
+                        runOnUiThread(() -> ((TextView) findViewById(R.id.result)).setText(e.getMessage()));
                         e.printStackTrace();
                     }
 
@@ -113,4 +113,4 @@ public class MainActivity extends AppCompatActivity {
             Log.i(TAG, "Account import cancelled.");
         }
     }
-}
\ No newline at end of file
+}