build.gradle

@@ -12,6 +12,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:2.3.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'com.google.gms:google-services:4.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

scripts/release-commit.sh

@@ -19,7 +19,7 @@ else
 fi
 
 github-release release -u skygeario -r skygear-SDK-Android --draft --tag $SKYGEAR_VERSION --name "$SKYGEAR_VERSION" --description "`cat new-release`"
-cat CHANGELOG.md >> new-release && mv new-release CHANGELOG.md
+echo "" >> new-release && cat CHANGELOG.md >> new-release && mv new-release CHANGELOG.md
 make update-version VERSION=$SKYGEAR_VERSION
 git add CHANGELOG.md skygear/build.gradle
 git commit -m "Update CHANGELOG for $SKYGEAR_VERSION"

skygear/build.gradle

@@ -42,7 +42,7 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 18
         targetSdkVersion 26
         versionCode 1
         versionName skygearVersion
@@ -61,25 +61,30 @@ android {
 }
 
 dependencies {
-
-    compile 'com.google.android.gms:play-services-base:11.4.2'
-    compile 'com.google.android.gms:play-services-gcm:11.4.2'
+    compile 'com.google.firebase:firebase-messaging:17.3.4'
     compile 'com.android.support:appcompat-v7:26.1.0'
 
-    compile 'com.android.volley:volley:1.0.0'
+
+    compile 'com.android.volley:volley:1.1.0'
     compile ('io.skygear:volleyEx:0.0.1') {
         exclude group: 'com.android.support'
     }
-    compile 'joda-time:joda-time:2.9.4'
-    compile 'org.java-websocket:Java-WebSocket:1.3.8'
+    compile 'joda-time:joda-time:2.10'
+    compile 'org.java-websocket:Java-WebSocket:1.3.9'
+
+    compile('org.simpleframework:simple-xml:2.7.+'){
+        exclude module: 'stax'
+        exclude module: 'stax-api'
+        exclude module: 'xpp3'
+    }
 
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
     testCompile 'junit:junit:4.12'
 
-    androidTestCompile 'com.android.support:support-annotations:26.1.0'
-    androidTestCompile 'com.android.support.test:runner:1.0.1'
-    androidTestCompile 'com.android.support.test:rules:1.0.1'
+    androidTestCompile 'com.android.support:support-annotations:28.0.0'
+    androidTestCompile 'com.android.support.test:runner:1.0.2'
+    androidTestCompile 'com.android.support.test:rules:1.0.2'
 }
 
 task generateSourcesJar(type: Jar) {

skygear/lint.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="InvalidPackage">
+        <!--
+        http://sourceforge.net/p/simple/mailman/simple-support/thread/339270128E13BE47A6B10EED7367E7852BC2A912@MERCMBX18D.na.SAS.com/
+        Q: "The new Android developer tools (21.1) are reporting many cases of invalid package references in the SimpleXML library jar"
+        A: "Just ignore this, it should be a warning only, this references StAX which is not available on Android. SimpleXML will default to XmlPull"
+        -->
+        <ignore path="**/simple-xml-2.7.1.jar"/>
+    </issue>
+</lint>

skygear/src/androidTest/java/io/skygear/skygear/AssetPostRequestUnitTest.java

@@ -26,6 +26,8 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.security.InvalidParameterException;
 import java.util.HashMap;
 import java.util.Map;
@@ -42,12 +44,12 @@ public class AssetPostRequestUnitTest {
 
     @Before
     public void setUp() throws Exception {
-        asset = new Asset(
-                "hello.txt",
-                "http://skygear.dev/asset/3f72d553-3aca-4668-8c9f-a454cf7b28e8-hello.txt",
-                "text/plain"
-        );
-        asset.data = "hello world".getBytes();
+        byte[] data = "hello world".getBytes();
+        asset = new Asset.Builder("hello.txt")
+                .setMimeType("text/plain")
+                .setData(data)
+                .build();
+        asset.url = "http://skygear.dev/asset/3f72d553-3aca-4668-8c9f-a454cf7b28e8-hello.txt";
     }
 
     @After
@@ -131,12 +133,12 @@ public void testAssetPostRequestValidationNotAllowAssetNoData() throws Exception
 
     @Test(expected = InvalidParameterException.class)
     public void testAssetPostRequestValidationNotAllowNonTypedAsset() throws Exception {
-        Asset assetWithoutType = new Asset(
-                "hello.txt",
-                "http://skygear.dev/asset/3f72d553-3aca-4668-8c9f-a454cf7b28e8-hello.txt",
-                ""
-        );
-        assetWithoutType.data = "hello world".getBytes();
+        byte[] data = "hello world".getBytes();
+        Asset assetWithoutType = new Asset.Builder("hello.txt")
+                .setMimeType("")
+                .setData(data)
+                .build();
+        assetWithoutType.url = "http://skygear.dev/asset/3f72d553-3aca-4668-8c9f-a454cf7b28e8-hello.txt";
 
         AssetPostRequest postRequest = new AssetPostRequest(
                 assetWithoutType,
@@ -157,7 +159,7 @@ public void testAssetPostRequestHandleSuccessResponse() throws Exception {
         );
 
         final boolean[] checkpoints = new boolean[]{ false };
-        postRequest.responseHandler = new AssetPostRequest.ResponseHandler() {
+        postRequest.setResponseHandler(new AssetPostRequest.ResponseHandler() {
             @Override
             public void onPostSuccess(Asset asset, String response) {
                 assertEquals(response, "Upload success");
@@ -166,7 +168,7 @@ public void onPostSuccess(Asset asset, String response) {
                 assertEquals(assetToUpload.getUrl(), asset.getUrl());
                 assertEquals(assetToUpload.getMimeType(), asset.getMimeType());
                 assertEquals(assetToUpload.getSize(), asset.getSize());
-                assertEquals(assetToUpload.data, asset.data);
+                assertEquals(assetToUpload.inputStream, asset.inputStream);
                 assertFalse(asset.isPendingUpload());
 
                 checkpoints[0] = true;
@@ -176,7 +178,7 @@ public void onPostSuccess(Asset asset, String response) {
             public void onPostFail(Asset asset, Error error) {
                 fail("Should not get fail callback");
             }
-        };
+        });
 
         postRequest.onResponse("Upload success");
         assertTrue(checkpoints[0]);
@@ -192,7 +194,7 @@ public void testAssetPostRequestHandleErrorResponse() throws Exception {
         );
 
         final boolean[] checkpoints = new boolean[]{ false };
-        postRequest.responseHandler = new AssetPostRequest.ResponseHandler() {
+        postRequest.setResponseHandler(new AssetPostRequest.ResponseHandler() {
             @Override
             public void onPostSuccess(Asset asset, String response) {
                 fail("Should not get success callback");
@@ -204,13 +206,13 @@ public void onPostFail(Asset asset, Error error) {
                 assertEquals(assetToUpload.getUrl(), asset.getUrl());
                 assertEquals(assetToUpload.getMimeType(), asset.getMimeType());
                 assertEquals(assetToUpload.getSize(), asset.getSize());
-                assertEquals(assetToUpload.data, asset.data);
+                assertEquals(assetToUpload.inputStream, asset.inputStream);
 
                 assertEquals("Test Error", error.getDetailMessage());
 
                 checkpoints[0] = true;
             }
-        };
+        });
 
         postRequest.onErrorResponse(new VolleyError("Test Error"));
         assertTrue(checkpoints[0]);

skygear/src/androidTest/java/io/skygear/skygear/AssetPreparePostRequestUnitTest.java

@@ -30,7 +30,10 @@
 public class AssetPreparePostRequestUnitTest {
     @Test
     public void testAssetPreparePostRequestNormalFlow() throws Exception {
-        Asset asset = new Asset("hello.txt", "text/plain", "Hello World".getBytes());
+        Asset asset = new Asset.Builder("hello.txt")
+                .setMimeType("text/plain")
+                .setData("Hello World".getBytes())
+                .build();
         AssetPreparePostRequest request = new AssetPreparePostRequest(asset);
 
         assertEquals("asset:put", request.action);
@@ -41,6 +44,7 @@ public void testAssetPreparePostRequestNormalFlow() throws Exception {
 
     @Test(expected = InvalidParameterException.class)
     public void testAssetPreparePostRequestNotAllowNoFilename() throws Exception {
+        // Use deprecated constructor to test request.validate
         Asset asset = new Asset(null, "text/plain", "Hello World".getBytes());
         AssetPreparePostRequest request = new AssetPreparePostRequest(asset);
 
@@ -49,6 +53,7 @@ public void testAssetPreparePostRequestNotAllowNoFilename() throws Exception {
 
     @Test(expected = InvalidParameterException.class)
     public void testAssetPreparePostRequestNotAllowNoMimeType() throws Exception {
+        // Use deprecated constructor to test request.validate
         Asset asset = new Asset("hello.txt", null, "Hello World".getBytes());
         AssetPreparePostRequest request = new AssetPreparePostRequest(asset);
 
@@ -57,6 +62,7 @@ public void testAssetPreparePostRequestNotAllowNoMimeType() throws Exception {
 
     @Test(expected = InvalidParameterException.class)
     public void testAssetPreparePostRequestNotAllowNoData() throws Exception {
+        // Use deprecated constructor to test request.validate
         Asset asset = new Asset("hello.txt", "text/plain", new byte[]{});
         AssetPreparePostRequest request = new AssetPreparePostRequest(asset);
 

skygear/src/androidTest/java/io/skygear/skygear/AssetPreparePostResponseHandlerUnitTest.java

@@ -25,6 +25,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.io.IOException;
 import java.util.Map;
 
 import static junit.framework.Assert.assertEquals;
@@ -37,11 +38,10 @@ public class AssetPreparePostResponseHandlerUnitTest {
 
     @Before
     public void setUp() throws Exception {
-        asset = new Asset(
-                "hello.txt",
-                "text/plain",
-                "hello world".getBytes()
-        );
+        asset = new Asset.Builder("hello.txt")
+                .setMimeType("text/plain")
+                .setData("hello world".getBytes())
+                .build();
     }
 
     @After
@@ -73,8 +73,17 @@ public void testAssetPreparePostResponseHandlerSuccessFlow() throws Exception {
             @Override
             public void onPreparePostSuccess(AssetPostRequest postRequest) {
                 Asset asset = postRequest.getAsset();
+                byte[] data = null;
+                try {
+                    data = new byte[asset.inputStream.available()];
+                    asset.inputStream.read(data);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    assertTrue(false);
+                }
+
                 assertEquals("598bfc9a-ba98-45a5-b194-22ceea2b4954-hello.txt", asset.getName());
-                assertEquals("hello world", new String(asset.data));
+                assertEquals("hello world", new String(data));
                 assertEquals(11, asset.getSize());
                 assertEquals("text/plain", asset.getMimeType());
                 assertEquals(
@@ -125,8 +134,17 @@ public void testAssetPreparePostResponseHandlerSuccessWithNoExtraPostFieldsFlow(
             @Override
             public void onPreparePostSuccess(AssetPostRequest postRequest) {
                 Asset asset = postRequest.getAsset();
+                byte[] data = null;
+                try {
+                    data = new byte[asset.inputStream.available()];
+                    asset.inputStream.read(data);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    assertTrue(false);
+                }
+
                 assertEquals("598bfc9a-ba98-45a5-b194-22ceea2b4954-hello.txt", asset.getName());
-                assertEquals("hello world", new String(asset.data));
+                assertEquals("hello world", new String(data));
                 assertEquals(11, asset.getSize());
                 assertEquals("text/plain", asset.getMimeType());
                 assertEquals(
@@ -170,7 +188,7 @@ public void onPreparePostFail(Error error) {
                 checkpoints[0] = true;
             }
         };
-        handler.onFail(new Error("Test Error"));
+        handler.onFailure(new Error("Test Error"));
         assertTrue(checkpoints[0]);
     }
 }

skygear/src/androidTest/java/io/skygear/skygear/AssetUnitTest.java

@@ -17,11 +17,20 @@
 
 package io.skygear.skygear;
 
+import android.net.Uri;
 import android.support.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.io.StringWriter;
+
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertNull;
@@ -33,11 +42,17 @@ public class AssetUnitTest {
     public void testAssetCreationFromData() throws Exception {
         byte[] data = "Hello World".getBytes();
 
-        Asset asset = new Asset("hello.txt", "text/plain", data);
+        Asset asset = new Asset.Builder("hello.txt")
+                .setMimeType("text/plain")
+                .setData(data)
+                .build();
+
+        String result = new BufferedReader(new InputStreamReader(asset.inputStream)).readLine();
 
         assertEquals("hello.txt", asset.getName());
         assertEquals("text/plain", asset.getMimeType());
         assertEquals(11, asset.getSize());
+        assertEquals("Hello World", result);
         assertTrue(asset.isPendingUpload());
         assertNull(asset.getUrl());
     }
@@ -59,4 +74,69 @@ public void testAssetCreationFromUrl() throws Exception {
                 asset.getUrl()
         );
     }
-}
+
+    @Test
+    public void testAssetCreationFromInputStream() throws Exception {
+        String string = "Hello World";
+        InputStream inputStream = new ByteArrayInputStream(string.getBytes());
+
+        Asset asset = new Asset.Builder("hello.txt")
+                .setMimeType("text/plain")
+                .setSize(11L)
+                .setInputStream(inputStream)
+                .build();
+
+        String result = new BufferedReader(new InputStreamReader(asset.inputStream)).readLine();
+
+        assertEquals("hello.txt", asset.getName());
+        assertEquals("text/plain", asset.getMimeType());
+        assertEquals(11, asset.getSize());
+        assertEquals("Hello World", result);
+        assertTrue(asset.isPendingUpload());
+        assertNull(asset.getUrl());
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testAssetBuilderWithoutSettingAnyDataSource() throws Exception {
+        new Asset.Builder("hello.txt").build();
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testAssetBuilderWithDataButMissingName() throws Exception {
+        new Asset.Builder(null)
+                .setMimeType("text/plain")
+                .setData("Hello World".getBytes())
+                .build();
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testAssetBuilderWithDataButMissingMimeType() throws Exception {
+        new Asset.Builder("hello.txt")
+                .setMimeType(null)
+                .setData("Hello World".getBytes())
+                .build();
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testAssetBuilderWithUriButMissingContext() throws Exception {
+        new Asset.Builder("hello.txt")
+                .setUri(Uri.parse("content://abc.txt"))
+                .build();
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testAssetBuilderWithInputStreamButMissingSize() throws Exception {
+        new Asset.Builder("hello.txt")
+                .setInputStream(new ByteArrayInputStream(new byte[]{}))
+                .setMimeType("text/plain")
+                .build();
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testAssetBuilderWithInputStreamButMissingMimeType() throws Exception {
+        new Asset.Builder("hello.txt")
+                .setInputStream(new ByteArrayInputStream(new byte[]{}))
+                .setSize(0L)
+                .build();
+    }
+}