add required params to constructorfeature/issue_sdl_manager_lifecycle

2 files changed, 24 insertions, 23 deletions

diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/api/SdlManagerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/api/SdlManagerTests.java
index 14af0466b..89dc0bdd2 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/api/SdlManagerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/api/SdlManagerTests.java
@@ -85,20 +85,7 @@ public class SdlManagerTests extends AndroidTestCase {
 	private SdlManager createSampleManager(String appName, String appId){
 		SdlManager manager;
 
-		// build manager object - use all setters, will test using getters below
-		SdlManager.Builder builder = new SdlManager.Builder();
-		builder.setAppId(appId);
-		builder.setAppName(appName);
-		builder.setShortAppName(appName);
-		builder.setAppTypes(appType);
-		builder.setTransportType(transport);
-		builder.setContext(getTestContext());
-		builder.setLanguage(Language.EN_US);
-		builder.setDayColorScheme(templateColorScheme);
-		builder.setNightColorScheme(templateColorScheme);
-		builder.setVrSynonyms(Test.GENERAL_VECTOR_STRING);
-		builder.setTtsName(Test.GENERAL_VECTOR_TTS_CHUNKS);
-		builder.setManagerListener(new SdlManagerListener() {
+		SdlManagerListener listener = new SdlManagerListener() {
 			@Override
 			public void onStart() {
 				listenerCalledCounter++;
@@ -113,7 +100,18 @@ public class SdlManagerTests extends AndroidTestCase {
 			public void onError(String info, Exception e) {
 
 			}
-		});
+		};
+
+		// build manager object - use all setters, will test using getters below
+		SdlManager.Builder builder = new SdlManager.Builder(getTestContext(),appId,appName,listener);
+		builder.setShortAppName(appName);
+		builder.setAppTypes(appType);
+		builder.setTransportType(transport);
+		builder.setLanguage(Language.EN_US);
+		builder.setDayColorScheme(templateColorScheme);
+		builder.setNightColorScheme(templateColorScheme);
+		builder.setVrSynonyms(Test.GENERAL_VECTOR_STRING);
+		builder.setTtsName(Test.GENERAL_VECTOR_TTS_CHUNKS);
 		manager = builder.build();
 
 		// mock SdlProxyBase and set it manually
diff --git a/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java b/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java
index 34c3c6e6a..da2045068 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java
@@ -184,15 +184,18 @@ public class SdlManager{
 		SdlManager sdlManager;
 
 		/**
-		 * Main Builder for SDL Manager<br>
-		 *
-		 * The following setters are <strong>REQUIRED:</strong><br>
-		 *
-		 * • setAppId <br>
-		 * • setAppName
+		 * Builder for the SdlManager. Parameters in the constructor are required.
+		 * @param context the current context
+		 * @param appId the app's ID
+		 * @param appName the app's name
+		 * @param listener a SdlManagerListener object
 		 */
-		public Builder(){
+		public Builder(@NonNull Context context, @NonNull final String appId, @NonNull final String appName, @NonNull final SdlManagerListener listener){
 			sdlManager = new SdlManager();
+			setContext(context);
+			setAppId(appId);
+			setAppName(appName);
+			setManagerListener(listener);
 		}
 
 		/**
@@ -312,7 +315,7 @@ public class SdlManager{
 		 * Set the SdlManager Listener
 		 * @param listener the listener
 		 */
-		public Builder setManagerListener(@NonNull SdlManagerListener listener){
+		public Builder setManagerListener(@NonNull final SdlManagerListener listener){
 			sdlManager.managerListener = listener;
 			return this;
 		}