From a3001d93f8db2a79f5f5d339b960eeedaff4f7e2 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Mon, 14 Mar 2016 19:10:22 +0100
Subject: [PATCH] Add support for Assets to DataItem

---
 .../wearable/internal/DataItemParcelable.java | 31 +++++++++++++++++--
 .../gms/wearable/internal/PutDataRequest.java |  4 +--
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/DataItemParcelable.java b/play-services-api/src/main/java/com/google/android/gms/wearable/internal/DataItemParcelable.java
index 1d6bef63..62040109 100644
--- a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/DataItemParcelable.java
+++ b/play-services-api/src/main/java/com/google/android/gms/wearable/internal/DataItemParcelable.java
@@ -19,13 +19,16 @@ package com.google.android.gms.wearable.internal;
 import android.net.Uri;
 import android.os.Bundle;
 
+import com.google.android.gms.wearable.DataItem;
+import com.google.android.gms.wearable.DataItemAsset;
+
 import org.microg.safeparcel.AutoSafeParcelable;
 import org.microg.safeparcel.SafeParceled;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class DataItemParcelable extends AutoSafeParcelable {
+public class DataItemParcelable extends AutoSafeParcelable implements DataItem {
     @SafeParceled(1)
     private int versionCode = 1;
     @SafeParceled(2)
@@ -50,8 +53,8 @@ public class DataItemParcelable extends AutoSafeParcelable {
         data = null;
     }
 
-    public Map<String, DataItemAssetParcelable> getAssets() {
-        Map<String, DataItemAssetParcelable> assets = new HashMap<String, DataItemAssetParcelable>();
+    public Map<String, DataItemAsset> getAssets() {
+        Map<String, DataItemAsset> assets = new HashMap<String, DataItemAsset>();
         this.assets.setClassLoader(DataItemAssetParcelable.class.getClassLoader());
         for (String key : this.assets.keySet()) {
             assets.put(key, (DataItemAssetParcelable) this.assets.getParcelable(key));
@@ -59,9 +62,31 @@ public class DataItemParcelable extends AutoSafeParcelable {
         return assets;
     }
 
+    @Override
+    public byte[] getData() {
+        return data;
+    }
+
+    @Override
     public Uri getUri() {
         return uri;
     }
 
+    @Override
+    public DataItem setData(byte[] data) {
+        this.data = data;
+        return this;
+    }
+
+    @Override
+    public DataItem freeze() {
+        return this;
+    }
+
+    @Override
+    public boolean isDataValid() {
+        return true;
+    }
+
     public static final Creator<DataItemParcelable> CREATOR = new AutoCreator<DataItemParcelable>(DataItemParcelable.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/PutDataRequest.java b/play-services-api/src/main/java/com/google/android/gms/wearable/internal/PutDataRequest.java
index 53529134..49018144 100644
--- a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/PutDataRequest.java
+++ b/play-services-api/src/main/java/com/google/android/gms/wearable/internal/PutDataRequest.java
@@ -137,8 +137,8 @@ public class PutDataRequest extends AutoSafeParcelable {
         sb.append("PutDataRequest[uri=").append(uri)
                 .append(", data=").append(data == null ? "null" : Base64.encodeToString(data, Base64.NO_WRAP))
                 .append(", numAssets=").append(getAssets().size());
-        if (verbose) {
-            sb.append(",assets=[");
+        if (verbose && !getAssets().isEmpty()) {
+            sb.append(", assets=[");
             for (String key : getAssets().keySet()) {
                 sb.append(key).append('=').append(getAsset(key)).append(", ");
             }