Skip to content

Commit e65872a

Browse files
Merge pull request #1525 from hufman/crash_unset_region
Don't crash fetching experiments before setting a region
2 parents ffe952e + f1de0e6 commit e65872a

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

onebusaway-android/src/main/java/org/onebusaway/android/io/request/survey/ObaStudyRequest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import org.onebusaway.android.R;
99
import org.onebusaway.android.app.Application;
10+
import org.onebusaway.android.io.elements.ObaRegion;
1011
import org.onebusaway.android.io.request.RequestBase;
1112
import org.onebusaway.android.io.request.survey.model.StudyResponse;
1213
import org.onebusaway.android.ui.survey.SurveyPreferences;
@@ -28,7 +29,9 @@ public static class Builder {
2829
private static Uri URI = null;
2930

3031
public Builder(Context context) {
31-
String baseUrl = Application.get().getCurrentRegion().getSidecarBaseUrl();
32+
ObaRegion region = Application.get().getCurrentRegion();
33+
if (region == null) return;
34+
String baseUrl = region.getSidecarBaseUrl();
3235
if(baseUrl == null) return;
3336
String studyAPIURL = baseUrl + Application.get().getResources().getString(R.string.studies_api_endpoint);
3437
studyAPIURL = studyAPIURL.replace("regionID", String.valueOf(Application.get().getCurrentRegion().getId()));

0 commit comments

Comments
 (0)