Reuse security classes from base in android

2 files changed, 2 insertions, 92 deletions

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/security/ISecurityInitializedListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/security/ISecurityInitializedListener.java
deleted file mode 100644
index f18152ed0..000000000
--- a/android/sdl_android/src/main/java/com/smartdevicelink/security/ISecurityInitializedListener.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.smartdevicelink.security;
-
-public interface ISecurityInitializedListener {
-	public void onSecurityInitialized();
-}
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/security/SdlSecurityBase.java b/android/sdl_android/src/main/java/com/smartdevicelink/security/SdlSecurityBase.java
index b3f324267..203854ddd 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/security/SdlSecurityBase.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/security/SdlSecurityBase.java
@@ -1,90 +1,12 @@
 package com.smartdevicelink.security;

 

-import java.util.ArrayList;

-import java.util.List;

-

 import android.app.Service;

 import android.content.Context;

 

-import com.smartdevicelink.SdlConnection.SdlSession;

-import com.smartdevicelink.protocol.enums.SessionType;

+public abstract class SdlSecurityBase extends BaseSdlSecurityBase{

 

-public abstract class SdlSecurityBase {

-	

-	protected SdlSession session = null;	

-	protected String appId = null;

-	protected List<String> makeList = null;

-	protected boolean isInitSuccess = false;

-	protected byte sessionId = 0;

 	protected static Service appService = null;

 	protected static Context context;

-	protected List<SessionType> startServiceList = new ArrayList<SessionType>();	

-	

-    public SdlSecurityBase() {

-	}

-	

-	public abstract void initialize();

-	

-    public abstract Integer runHandshake(byte[] inputData,byte[] outputData);

-    

-	public abstract Integer encryptData(byte[] inputData,byte[] outputData);

-	

-    public abstract Integer decryptData(byte[] inputData,byte[] outputData);

-    

-    public abstract void shutDown();

-    

-    public void resetParams() {

-    	session = null;

-    	appId = null;

-    	isInitSuccess = false;

-    	startServiceList.clear();

-    }

-    

-    public List<SessionType> getServiceList() {

-    	return startServiceList;

-    }

-    

-    public void handleInitResult(boolean val) {

-        if (session == null) return;

-

-        setInitSuccess(val);

-        session.onSecurityInitialized();

-    }

-    

-    public void handleSdlSession(SdlSession val) {

-    	if (val == null) return;

-    	

-    	setSessionId(val.getSessionId());

-    	setSdlSession(val);

-    }

-	

-    private void setInitSuccess(boolean val) {

-    	isInitSuccess = val;

-    }

-    

-    public boolean getInitSuccess() {

-    	return isInitSuccess;

-    }

-    

-    private void setSessionId(byte val) {

-    	sessionId = val;

-    }

-    

-    public byte getSessionId() {

-    	return sessionId;

-    }

-

-    private void setSdlSession(SdlSession val) {

-    	session = val;

-    }

-    

-    public String getAppId() {

-    	return appId;

-    }

-    

-    public void setAppId(String val) {

-    	appId = val;

-    }

 

     @Deprecated

     public static Service getAppService() {

@@ -106,12 +28,5 @@ public abstract class SdlSecurityBase {
     public static void setContext(Context val) {

         context = val;

     }

-    

-    public List<String> getMakeList() {

-    	return makeList;

-    }

-    

-    public void setMakeList(List<String> val) {

-    	makeList = val;

-    }

+

 }