Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Use correct base URL in NetworkModule #1921

Merged
merged 2 commits into from
Aug 26, 2019
Merged

fix: Use correct base URL in NetworkModule #1921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06bb283
fix: Use correct base URL in NetworkModule
ShridharGoel Aug 26, 2019
c7a31ff
fix: Use correct base URL in NetworkModule
ShridharGoel Aug 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/src/main/java/com/eventyay/organizer/common/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/com/eventyay/organizer/common/di/module/NetworkModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -52,6 +51,8 @@
@SuppressWarnings("PMD.CouplingBetweenObjects")
public class NetworkModule {

private AuthHolder authHolder;

@Provides
@Singleton
ObjectMapper providesObjectMapper() {
Expand Down Expand Up @@ -110,6 +111,7 @@ StethoInterceptor stethoInterceptor() {
@Singleton
@Named("authenticator")
Interceptor authenticator(AuthHolder authHolder) {
this.authHolder = authHolder;
return chain -> {
Request original = chain.request();

Expand Down Expand Up @@ -164,7 +166,7 @@ Retrofit providesRetrofitBuilder(CallAdapter.Factory callAdapterFactory,
.addConverterFactory(jsonApiConverter)
.addConverterFactory(factory)
.client(client)
.baseUrl(Constants.BASE_URL)
.baseUrl(authHolder.getBaseUrl())
.build();
}
}
5 changes: 5 additions & 0 deletions app/src/main/java/com/eventyay/organizer/data/auth/AuthHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}