Fix feedback from reviewbugfix/issue_1377_Parcelable

5 files changed, 33 insertions, 31 deletions

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java
index a5cdaee97..b4c0e5be9 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java
@@ -7,13 +7,12 @@ import com.smartdevicelink.transport.enums.TransportType;
 
 public class TransportRecord extends BaseTransportRecord implements Parcelable {
 
-    private TransportType type;
-    private String address;
-
     public TransportRecord(TransportType transportType, String address) {
         super(transportType, address);
-        this.type = transportType;
-        this.address = address;
+    }
+
+    public TransportRecord(Parcel p) {
+        super(p);
     }
 
     @Override
@@ -36,19 +35,7 @@ public class TransportRecord extends BaseTransportRecord implements Parcelable {
 
     public static final Parcelable.Creator<TransportRecord> CREATOR = new Parcelable.Creator<TransportRecord>() {
         public TransportRecord createFromParcel(Parcel in) {
-            TransportType type = null;
-            String address = "";
-            if (in.readInt() == 1) { //We should have a transport type attached
-                String transportName = in.readString();
-                if(transportName != null){
-                    type = TransportType.valueOf(transportName);
-                }
-            }
-
-            if (in.readInt() == 1) { //We should have a transport address attached
-                address = in.readString();
-            }
-            return new TransportRecord(type, address);
+            return new TransportRecord(in);
         }
 
         @Override
diff --git a/base/src/main/java/com/smartdevicelink/protocol/BaseSdlPacket.java b/base/src/main/java/com/smartdevicelink/protocol/BaseSdlPacket.java
index aed3cd736..21362b53e 100644
--- a/base/src/main/java/com/smartdevicelink/protocol/BaseSdlPacket.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/BaseSdlPacket.java
@@ -31,13 +31,9 @@
  */
 package com.smartdevicelink.protocol;
 
-import android.os.Parcel;
-import android.os.Parcelable;
-
 import com.livio.BSON.BsonEncoder;
 import com.smartdevicelink.protocol.enums.FrameType;
 import com.smartdevicelink.transport.utl.TransportRecord;
-import com.smartdevicelink.util.DebugTool;
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;
diff --git a/base/src/main/java/com/smartdevicelink/transport/utl/BaseTransportRecord.java b/base/src/main/java/com/smartdevicelink/transport/utl/BaseTransportRecord.java
index 6fd1dc452..95b3e8858 100644
--- a/base/src/main/java/com/smartdevicelink/transport/utl/BaseTransportRecord.java
+++ b/base/src/main/java/com/smartdevicelink/transport/utl/BaseTransportRecord.java
@@ -32,12 +32,13 @@
 
 package com.smartdevicelink.transport.utl;
 
+import android.os.Parcel;
 import com.smartdevicelink.transport.enums.TransportType;
 
 class BaseTransportRecord{
 
-    private TransportType type;
-    private String address;
+    protected TransportType type;
+    protected String address;
 
     BaseTransportRecord(TransportType transportType, String address){
         this.type = transportType;
@@ -77,4 +78,17 @@ class BaseTransportRecord{
         builder.append(address);
         return builder.toString();
     }
+
+    BaseTransportRecord(Parcel p) {
+        if (p.readInt() == 1) { //We should have a transport type attached
+            String transportName = p.readString();
+            if(transportName != null){
+                this.type = TransportType.valueOf(transportName);
+            }
+        }
+
+        if (p.readInt() == 1) { //We should have a transport address attached
+            address = p.readString();
+        }
+    }
 }
diff --git a/javaSE/src/main/java/com/smartdevicelink/protocol/SdlPacket.java b/javaSE/src/main/java/com/smartdevicelink/protocol/SdlPacket.java
index bf3e7e766..d9a14b6f7 100644
--- a/javaSE/src/main/java/com/smartdevicelink/protocol/SdlPacket.java
+++ b/javaSE/src/main/java/com/smartdevicelink/protocol/SdlPacket.java
@@ -35,7 +35,6 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 public class SdlPacket extends BaseSdlPacket {
-    private static final int EXTRA_PARCEL_DATA_LENGTH 			= 24;
 
     public SdlPacket(int version, boolean encryption, int frameType,
                      int serviceType, int frameInfo, int sessionId,
diff --git a/javaSE/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java b/javaSE/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java
index c9f3820fe..5e08de40c 100644
--- a/javaSE/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java
+++ b/javaSE/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java
@@ -36,18 +36,14 @@ import android.os.Parcelable;
 import com.smartdevicelink.transport.enums.TransportType;
 
 public class TransportRecord extends BaseTransportRecord {
-    private TransportType type;
-    private String address;
 
     public TransportRecord(TransportType transportType, String address) {
         super(transportType, address);
-        this.type = transportType;
-        this.address = address;
     }
 
     @Deprecated
     public TransportRecord(Parcel p) {
-        super(null, "");
+        super(p);
     }
 
     @Deprecated
@@ -56,7 +52,17 @@ public class TransportRecord extends BaseTransportRecord {
     };
 
     @Deprecated
-    public void writeToParcel(Parcel dest, int flags) {}
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeInt(type!=null? 1 : 0);
+        if(type != null){
+            dest.writeString(type.name());
+        }
+
+        dest.writeInt(address !=null? 1 : 0);
+        if(address != null){
+            dest.writeString(address);
+        }
+    }
 
     @Deprecated
     public static final Parcelable.Creator<TransportRecord> CREATOR = new Parcelable.Creator<TransportRecord>() {