Merge pull request #1401 from smartdevicelink/bugfix/issue_1400

Add hashId to sdlmanager builder

2 files changed, 22 insertions, 3 deletions

diff --git a/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java b/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java
index d27ea253c..234cbb22e 100644
--- a/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java
+++ b/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;
+    String appId, appName, shortAppName, resumeHash;
     boolean isMediaApp;
     Language hmiLanguage;
     Language language;
@@ -333,6 +333,7 @@ abstract class BaseSdlManager {
         appConfig.setAppID(appId);
         appConfig.setMinimumProtocolVersion(minimumProtocolVersion);
         appConfig.setMinimumRPCVersion(minimumRPCVersion);
+        appConfig.setResumeHash(resumeHash);
 
         lifecycleManager = new LifecycleManager(appConfig, transport, lifecycleListener);
         _internalInterface = lifecycleManager.getInternalInterface((SdlManager) BaseSdlManager.this);
@@ -630,6 +631,16 @@ abstract class BaseSdlManager {
         }
 
         /**
+         * Sets the Resumption Hash ID
+         *
+         * @param resumeHash String representation of the Hash ID Used to resume the application
+         */
+        public Builder setResumeHash(final String resumeHash) {
+            sdlManager.resumeHash = resumeHash;
+            return this;
+        }
+
+        /**
          * Sets the Application Name
          *
          * @param appName String that will be associated as the app's name
diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
index 4d126ea97..2934e5736 100644
--- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
@@ -1348,9 +1348,9 @@ abstract class BaseLifecycleManager {
                     rai.setAppHMIType(appConfig.getAppType());
                     rai.setDayColorScheme(appConfig.getDayColorScheme());
                     rai.setNightColorScheme(appConfig.getNightColorScheme());
+                    rai.setHashID(appConfig.getResumeHash());
 
                     //Add device/system info in the future
-                    //TODO attach previous hash id
 
                     sendRPCMessagePrivate(rai, true);
                 } else {
@@ -1405,7 +1405,7 @@ abstract class BaseLifecycleManager {
     }
 
     public static class AppConfig {
-        private String appID, appName, ngnMediaScreenAppName;
+        private String appID, appName, ngnMediaScreenAppName, resumeHash;
         private Vector<TTSChunk> ttsName;
         private Vector<String> vrSynonyms;
         private boolean isMediaApp = false;
@@ -1506,6 +1506,14 @@ abstract class BaseLifecycleManager {
             this.appType = appType;
         }
 
+        public String getResumeHash() {
+            return this.resumeHash;
+        }
+
+        public void setResumeHash(String resumeHash) {
+            this.resumeHash = resumeHash;
+        }
+
         public TemplateColorScheme getDayColorScheme() {
             return dayColorScheme;
         }