Fix checkbox type value formatting (#238)

We should be expecting an array of JSON objects, with `label` and `value` in each object.

Author: lzanita09

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ on: [push]
 jobs:
   test:
     name: Run unit tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - name: Setup JDK 11

README.md

@@ -42,9 +42,9 @@ This SDK uses the following libraries as dependencies:
 ### Gradle
 ```groovy
 // Required for Connect API integration.
-implementation "com.ifttt:connect-api:2.5.3"
+implementation "com.ifttt:connect-api:2.5.4"
 // Connect Button UI.
-implementation "com.ifttt:connect-button:2.5.3"
+implementation "com.ifttt:connect-button:2.5.4"
 ```
 
 ## Usage

app/build.gradle

@@ -3,7 +3,6 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
-    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
         applicationId "com.ifttt.groceryexpress"
@@ -24,6 +23,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
+    namespace 'com.ifttt.groceryexpress'
 }
 
 dependencies {

app/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.ifttt.groceryexpress">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>

build.gradle

@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.6.21'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -34,7 +34,7 @@ task clean(type: Delete) {
 
 ext {
     libVersion = '2.5.3'
-    okHttpVersion = '4.9.0'
+    okHttpVersion = '4.10.0'
     retrofitVersion = '2.9.0'
     moshiVersion = '1.8.0'
     workManagerVersion = '2.7.1'

connect-api/build.gradle

@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
-    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
@@ -22,6 +21,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'com.ifttt.connect.api'
 }
 
 dependencies {

connect-api/publish.gradle

@@ -77,11 +77,6 @@ afterEvaluate {
                             name = 'Zhe Lu'
                             email = 'zhe@ifttt.com'
                         }
-                        developer {
-                            id = 'priyaashah'
-                            name = 'Priya Shah'
-                            email = 'priya@ifttt.com'
-                        }
                     }
                     scm {
                         connection = gitUrl

connect-api/src/main/AndroidManifest.xml

@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.ifttt.connect.api" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />

connect-api/src/main/java/com/ifttt/connect/api/CheckBoxFieldValue.java

@@ -0,0 +1,58 @@
+package com.ifttt.connect.api;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Data structure representing the checkbox field values.
+ */
+public final class CheckBoxFieldValue implements Parcelable {
+
+    public final List<CheckBoxValue> value;
+
+    public CheckBoxFieldValue(List<CheckBoxValue> value) {
+        this.value = value;
+    }
+
+    protected CheckBoxFieldValue(Parcel in) {
+        value = in.createTypedArrayList(CheckBoxValue.CREATOR);
+    }
+
+    public static final Creator<CheckBoxFieldValue> CREATOR = new Creator<CheckBoxFieldValue>() {
+        @Override
+        public CheckBoxFieldValue createFromParcel(Parcel in) {
+            return new CheckBoxFieldValue(in);
+        }
+
+        @Override
+        public CheckBoxFieldValue[] newArray(int size) {
+            return new CheckBoxFieldValue[size];
+        }
+    };
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        CheckBoxFieldValue that = (CheckBoxFieldValue) o;
+        return Objects.equals(value, that.value);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(value);
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeTypedList(value);
+    }
+}

connect-api/src/main/java/com/ifttt/connect/api/CheckBoxValue.java

@@ -0,0 +1,57 @@
+package com.ifttt.connect.api;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.util.Objects;
+
+public final class CheckBoxValue implements Parcelable {
+        public final String label;
+        public final String value;
+
+        public CheckBoxValue(String label, String value) {
+            this.label = label;
+            this.value = value;
+        }
+
+        protected CheckBoxValue(Parcel in) {
+            label = in.readString();
+            value = in.readString();
+        }
+
+        public static final Creator<CheckBoxValue> CREATOR = new Creator<CheckBoxValue>() {
+            @Override
+            public CheckBoxValue createFromParcel(Parcel in) {
+                return new CheckBoxValue(in);
+            }
+
+            @Override
+            public CheckBoxValue[] newArray(int size) {
+                return new CheckBoxValue[size];
+            }
+        };
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            CheckBoxValue that = (CheckBoxValue) o;
+            return Objects.equals(label, that.label) && Objects.equals(value, that.value);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(label, value);
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeString(label);
+            dest.writeString(value);
+        }
+    }