Comment out usage of deprecated internal RPCs

2 files changed, 83 insertions, 6 deletions

diff --git a/base/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java b/base/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
index 988325bd9..e00309fb5 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
@@ -73,10 +73,8 @@ import com.smartdevicelink.proxy.rpc.OnHashChange;
 import com.smartdevicelink.proxy.rpc.OnInteriorVehicleData;

 import com.smartdevicelink.proxy.rpc.OnKeyboardInput;

 import com.smartdevicelink.proxy.rpc.OnLanguageChange;

-import com.smartdevicelink.proxy.rpc.OnLockScreenStatus;

 import com.smartdevicelink.proxy.rpc.OnPermissionsChange;

 import com.smartdevicelink.proxy.rpc.OnRCStatus;

-import com.smartdevicelink.proxy.rpc.OnStreamRPC;

 import com.smartdevicelink.proxy.rpc.OnSystemCapabilityUpdated;

 import com.smartdevicelink.proxy.rpc.OnSystemRequest;

 import com.smartdevicelink.proxy.rpc.OnTBTClientState;

@@ -105,7 +103,6 @@ import com.smartdevicelink.proxy.rpc.ShowConstantTbtResponse;
 import com.smartdevicelink.proxy.rpc.ShowResponse;

 import com.smartdevicelink.proxy.rpc.SliderResponse;

 import com.smartdevicelink.proxy.rpc.SpeakResponse;

-import com.smartdevicelink.proxy.rpc.StreamRPCResponse;

 import com.smartdevicelink.proxy.rpc.SubscribeButtonResponse;

 import com.smartdevicelink.proxy.rpc.SubscribeVehicleDataResponse;

 import com.smartdevicelink.proxy.rpc.SubscribeWayPointsResponse;

@@ -146,9 +143,9 @@ public interface IProxyListenerBase {
 

 	public void onServiceNACKed(OnServiceNACKed serviceNACKed);

 

-	public void onOnStreamRPC(OnStreamRPC notification);

+	//public void onOnStreamRPC(OnStreamRPC notification);

 

-	public void onStreamRPCResponse(StreamRPCResponse response);

+	//public void onStreamRPCResponse(StreamRPCResponse response);

 

 	/**

 	 * onProxyError() being called indicates that the SDL Proxy experenced an error.

@@ -370,7 +367,7 @@ public interface IProxyListenerBase {
 

 	public void onGetDTCsResponse(GetDTCsResponse response);

 

-	public void onOnLockScreenNotification(OnLockScreenStatus notification);

+	//public void onOnLockScreenNotification(OnLockScreenStatus notification);

 

 	public void onDialNumberResponse(DialNumberResponse response);

 

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnPutFileUpdateListener.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnPutFileUpdateListener.java
new file mode 100644
index 000000000..cac4ec523
--- /dev/null
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnPutFileUpdateListener.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2019, Livio, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Livio Inc. nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.smartdevicelink.proxy.rpc.listeners;
+
+import com.smartdevicelink.proxy.RPCResponse;
+
+@Deprecated
+public abstract class OnPutFileUpdateListener extends OnRPCResponseListener{
+
+	long totalSize = 0;
+
+	public OnPutFileUpdateListener(){
+		setListenerType(UPDATE_LISTENER_TYPE_PUT_FILE);
+	}
+	
+	@Override
+	public final void onStart(int correlationId) {
+		super.onStart(correlationId);
+		onStart(correlationId, totalSize); //We do this so we can send back the total size
+	}
+
+	public void onStart(int correlationId, long totalSize){
+		
+	}
+	
+	@Override
+	public final void onResponse(int correlationId, RPCResponse response) {
+		onResponse(correlationId, response, totalSize); //Calling our special abstract method
+	}
+	/**
+	 * Called when the putfile request is responded to.
+	 * @param correlationId correlation ID tied to the original response
+	 * @param response the PutFile response RPC
+	 * @param totalSize total size of the file sent
+	 */
+	public abstract void onResponse(int correlationId, RPCResponse response, long totalSize);
+	
+	/**
+	 * onUpdate is called during a putfile stream request
+	 * @param correlationId of the original request
+	 * @param bytesWritten the amount of bytes that have been written so far
+	 * @param totalSize total size of the file that is being sent
+	 */
+	public void onUpdate(int correlationId, long bytesWritten, long totalSize){
+		
+	};
+	
+	public final void setTotalSize(long totalSize){
+		this.totalSize = totalSize;
+	}
+}