Refactor to align with ios lib

Author: RHenigan

base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java

@@ -83,7 +83,7 @@ abstract class BaseSdlManager {
     static final String TAG = "BaseSubManager";
     final Object STATE_LOCK = new Object();
     int state = -1;
-    String appId, appName, shortAppName, hashId;
+    String appId, appName, shortAppName, resumeHash;
     boolean isMediaApp;
     Language hmiLanguage;
     Language language;
@@ -333,7 +333,7 @@ public void start() {
         appConfig.setAppID(appId);
         appConfig.setMinimumProtocolVersion(minimumProtocolVersion);
         appConfig.setMinimumRPCVersion(minimumRPCVersion);
-        appConfig.setHashId(hashId);
+        appConfig.setResumeHash(resumeHash);
 
         lifecycleManager = new LifecycleManager(appConfig, transport, lifecycleListener);
         _internalInterface = lifecycleManager.getInternalInterface((SdlManager) BaseSdlManager.this);
@@ -633,10 +633,10 @@ public Builder setAppId(@NonNull final String appId) {
         /**
          * Sets the Resumption Hash ID
          *
-         * @param hashId String representation of the Hash ID Used to resume the application
+         * @param resumeHash String representation of the Hash ID Used to resume the application
          */
-        public Builder setHashId(final String hashId) {
-            sdlManager.hashId = hashId;
+        public Builder setResumeHash(final String resumeHash) {
+            sdlManager.resumeHash = resumeHash;
             return this;
         }
 

base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java

@@ -1186,7 +1186,7 @@ public interface LifecycleListener {
     }
 
     public static class AppConfig {
-        private String appID, appName, ngnMediaScreenAppName, hashId;
+        private String appID, appName, ngnMediaScreenAppName, resumeHash;
         private Vector<TTSChunk> ttsName;
         private Vector<String> vrSynonyms;
         private boolean isMediaApp = false;
@@ -1287,12 +1287,12 @@ public void setAppType(Vector<AppHMIType> appType) {
             this.appType = appType;
         }
 
-        public String getHashId() {
-            return this.hashId;
+        public String getResumeHash() {
+            return this.resumeHash;
         }
 
-        public void setHashId(String hashId) {
-            this.hashId = hashId;
+        public void setResumeHash(String resumeHash) {
+            this.resumeHash = resumeHash;
         }
 
         public TemplateColorScheme getDayColorScheme() {
@@ -1513,7 +1513,7 @@ void onProtocolSessionStarted(SessionType sessionType) {
                     rai.setAppHMIType(appConfig.getAppType());
                     rai.setDayColorScheme(appConfig.getDayColorScheme());
                     rai.setNightColorScheme(appConfig.getNightColorScheme());
-                    rai.setHashID(appConfig.getHashId());
+                    rai.setHashID(appConfig.getResumeHash());
 
                     //Add device/system info in the future