Get Subpopulation Guid from build config (#12)

* Each study has a default subpopulation which has the studyId as its guid
* Additional subpopulations can be created

Author: liujoshua

app/build.gradle

@@ -13,26 +13,26 @@ android {
         versionCode 1
         versionName '1.0'
         multiDexEnabled true
+
+        // To configure communications with Bridge Study Manager (https://research.sagebridge.org/),
+        // create a 'gradle.properties' file in the same directory as this build.gradle and add
+        // the needed values, for example studyId="bridge_study_id" to make them available as
+        // BuildConfig.STUDY_ID, BuildConfig.STUDY_NAME, etc
+        buildConfigField 'String', 'STUDY_ID', studyId
+        buildConfigField 'String', 'STUDY_NAME', studyName
+        buildConfigField 'String', 'STUDY_SUBPOPULATION_GUID', studyId // default subpopulation
+        buildConfigField 'String', 'STUDY_BASE_URL', "\"https://webservices.sagebridge.org/\""
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            // create a 'gradle.properties' file in the same directory as this build.gradle and add
-            // the needed values, for example studyId="bridge_study_id" to make them available as
-            // BuildConfig.STUDY_ID, BuildConfig.STUDY_NAME, etc
-            buildConfigField 'String', 'STUDY_ID', studyId
-            buildConfigField 'String', 'STUDY_NAME', studyName
-            buildConfigField 'String', 'STUDY_BASE_URL', "\"https://webservices.sagebridge.org/\""
         }
 
         debug {
             debuggable true
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            buildConfigField 'String', 'STUDY_ID', studyId
-            buildConfigField 'String', 'STUDY_NAME', studyName
-            buildConfigField 'String', 'STUDY_BASE_URL', "\"https://webservices-staging.sagebridge.org/\""
         }
     }
 

app/src/main/java/org/researchstack/sampleapp/bridge/BridgeDataProvider.java

@@ -219,7 +219,7 @@ private void checkForTempConsentAndUpload(Context context)
             try
             {
                 ConsentSignatureBody consent = loadConsentSignatureBody(context);
-                uploadConsent(context, consent);
+                uploadConsent(context, BuildConfig.STUDY_SUBPOPULATION_GUID, consent);
             }
             catch(Exception e)
             {
@@ -444,12 +444,12 @@ private ConsentSignatureBody loadConsentSignatureBody(Context context)
     @Override
     public void uploadConsent(Context context, TaskResult consentResult)
     {
-        uploadConsent(context, createConsentSignatureBody(consentResult));
+        uploadConsent(context, BuildConfig.STUDY_SUBPOPULATION_GUID, createConsentSignatureBody(consentResult));
     }
 
-    private void uploadConsent(Context context, ConsentSignatureBody consent)
+    private void uploadConsent(Context context, String subpopulationGuid, ConsentSignatureBody consent)
     {
-        service.consentSignature(getStudyId(), consent)
+        service.consentSignature(subpopulationGuid, consent)
                 .compose(ObservableUtils.applyDefault())
                 .subscribe(response -> {
                     if(response.code() == 201 ||
@@ -966,8 +966,9 @@ public interface BridgeService
         Observable<Response<UserSessionInfo>> signIn(@Body SignInBody body);
 
         @Headers("Content-Type: application/json")
-        @POST("v3/subpopulations/{studyId}/consents/signature")
-        Observable<Response<BridgeMessageResponse>> consentSignature(@Path("studyId") String studyId, @Body ConsentSignatureBody body);
+        @POST("v3/subpopulations/{subpopulationGuid}/consents/signature")
+        Observable<Response<BridgeMessageResponse>> consentSignature(@Path("subpopulationGuid") String subpopulationGuid,
+                                                                     @Body ConsentSignatureBody body);
 
         /**
          * @return Response code <b>200</b> w/ message explaining instructions on how the user should
@@ -978,8 +979,9 @@ public interface BridgeService
         Observable<Response<BridgeMessageResponse>> requestResetPassword(@Body EmailBody body);
 
 
-        @POST("v3/subpopulations/{studyId}/consents/signature/withdraw")
-        Observable<Response<BridgeMessageResponse>> withdrawConsent(@Path("studyId") String studyId, @Body WithdrawalBody withdrawal);
+        @POST("v3/subpopulations/{subpopulationGuid}/consents/signature/withdraw")
+        Observable<Response<BridgeMessageResponse>> withdrawConsent(@Path("subpopulationGuid") String subpopulationGuid,
+                                                                    @Body WithdrawalBody withdrawal);
 
         /**
          * @return Response code <b>200</b> w/ message explaining instructions on how the user should