fix: Use correct base URL in NetworkModule (#1921)

fossasia · Aug 26, 2019 · e361004 · e361004
1 parent 27753c7
commit e361004
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/app/src/main/java/com/eventyay/organizer/common/Constants.java b/app/src/main/java/com/eventyay/organizer/common/Constants.java
@@ -1,8 +1,6 @@
 package com.eventyay.organizer.common;
 
 public final class Constants {
-    //url to login organiser
-    public static final String BASE_URL = "https://open-event-api-dev.herokuapp.com/v1/";
     //SharedPrefs db Name
     public static final String FOSS_PREFS = "FossPrefs";
     //No network available string

diff --git a/app/src/main/java/com/eventyay/organizer/common/di/module/NetworkModule.java b/app/src/main/java/com/eventyay/organizer/common/di/module/NetworkModule.java
@@ -1,7 +1,6 @@
 package com.eventyay.organizer.common.di.module;
 
 import com.eventyay.organizer.OrgaProvider;
-import com.eventyay.organizer.common.Constants;
 import com.eventyay.organizer.data.attendee.Attendee;
 import com.eventyay.organizer.data.auth.AuthHolder;
 import com.eventyay.organizer.data.copyright.Copyright;
@@ -52,6 +51,8 @@
 @SuppressWarnings("PMD.CouplingBetweenObjects")
 public class NetworkModule {
 
+    private AuthHolder authHolder;
+
     @Provides
     @Singleton
     ObjectMapper providesObjectMapper() {
@@ -110,6 +111,7 @@ StethoInterceptor stethoInterceptor() {
     @Singleton
     @Named("authenticator")
     Interceptor authenticator(AuthHolder authHolder) {
+        this.authHolder = authHolder;
         return chain -> {
             Request original = chain.request();
 
@@ -164,7 +166,7 @@ Retrofit providesRetrofitBuilder(CallAdapter.Factory callAdapterFactory,
             .addConverterFactory(jsonApiConverter)
             .addConverterFactory(factory)
             .client(client)
-            .baseUrl(Constants.BASE_URL)
+            .baseUrl(authHolder.getBaseUrl())
             .build();
     }
 }
diff --git a/app/src/main/java/com/eventyay/organizer/data/auth/AuthHolder.java b/app/src/main/java/com/eventyay/organizer/data/auth/AuthHolder.java
@@ -3,6 +3,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
+import com.eventyay.organizer.BuildConfig;
 import com.eventyay.organizer.data.user.User;
 import com.eventyay.organizer.common.Constants;
 import com.eventyay.organizer.common.ContextManager;
@@ -87,4 +88,8 @@ void logout() {
     void saveEmail(String email) {
         sharedPreferenceModel.addStringSetElement(Constants.SHARED_PREFS_SAVED_EMAIL, email);
     }
+
+    public String getBaseUrl() {
+        return sharedPreferenceModel.getString(Constants.SHARED_PREFS_BASE_URL, BuildConfig.DEFAULT_BASE_URL);
+    }
 }