base url changed to betadelivery
Some bug changes
This commit is contained in:
@@ -24,7 +24,7 @@ android {
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
buildConfigField "String", "WOKA_STAGINNG_BASE_URL", WOKA_STAGINNG_BASE_URL
|
||||
buildConfigField "String", "WOKA_BASE_URL", WOKA_BASE_URL
|
||||
buildConfigField "String", "WOKA_USER_NAME", WOKA_USER_NAME
|
||||
buildConfigField "String", "WOKA_PASSWORD", WOKA_PASSWORD
|
||||
|
||||
@@ -33,7 +33,7 @@ android {
|
||||
}
|
||||
|
||||
debug{
|
||||
buildConfigField "String", "WOKA_STAGINNG_BASE_URL", WOKA_STAGINNG_BASE_URL
|
||||
buildConfigField "String", "WOKA_BASE_URL", WOKA_BASE_URL
|
||||
buildConfigField "String", "WOKA_USER_NAME", WOKA_USER_NAME
|
||||
buildConfigField "String", "WOKA_PASSWORD", WOKA_PASSWORD
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ object RetrofitHelper {
|
||||
clientBuilder.callTimeout(20, TimeUnit.SECONDS)
|
||||
|
||||
retrofit = Retrofit.Builder()
|
||||
.baseUrl(BuildConfig.WOKA_STAGINNG_BASE_URL)
|
||||
.baseUrl(BuildConfig.WOKA_BASE_URL)
|
||||
.addConverterFactory(GsonConverterFactory.create())
|
||||
.client(clientBuilder.build())
|
||||
.build()
|
||||
|
||||
@@ -161,6 +161,7 @@ class SelectAvatarFragment : Fragment() {
|
||||
// logging out
|
||||
if (userPrefs?.userType == UserType.GUARDIAN || userPrefs?.userType == UserType.CHILD){
|
||||
progressView.show(getString(R.string.logging_you_out))
|
||||
userPrefs?.clearData()
|
||||
UserRepository.logout()
|
||||
}
|
||||
|
||||
|
||||
@@ -121,7 +121,7 @@ class UserPreference(val context: Context) {
|
||||
clearData()
|
||||
}
|
||||
|
||||
private fun clearData(){
|
||||
fun clearData(){
|
||||
MyListRepository.clearData()
|
||||
ShopRepository.clearCart()
|
||||
NotificationRepository.clearNotifications()
|
||||
|
||||
@@ -25,6 +25,12 @@ android.enableJetifier=true
|
||||
|
||||
|
||||
# BASE URLS
|
||||
WOKA_STAGINNG_BASE_URL="https://wokaland.com/secret-panel-10102023/hidden-admin-portal-20092023/api/"
|
||||
|
||||
# staging
|
||||
#WOKA_BASE_URL="https://wokaland.com/secret-panel-10102023/hidden-admin-portal-20092023/api/"
|
||||
|
||||
# testing
|
||||
WOKA_BASE_URL="https://wokanative.betadelivery.com/api/"
|
||||
|
||||
WOKA_USER_NAME="admin"
|
||||
WOKA_PASSWORD="Woka@1234"
|
||||
Reference in New Issue
Block a user