Skip to content

Commit 84b1672

Browse files
aggarwalpulkit596aggarwalpulkit596
committed
move base url to build config
1 parent 01c6be0 commit 84b1672

File tree

4 files changed

+65
-13
lines changed

4 files changed

+65
-13
lines changed

‎app/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ android {
3838
applicationId "com.codingblocks.cbonlineapp"
3939
minSdkVersion 21
4040
targetSdkVersion 29
41-
versionCode 101010000
41+
versionCode 101010001
4242
// 1 (versioning scheme)
4343
// 00 (major version)
4444
// 00 (minor version)
@@ -73,12 +73,14 @@ android {
7373
minifyEnabled false
7474
versionNameSuffix '-debug-version'
7575
applicationIdSuffix = '.debug'
76+
buildConfigField "String", "BASE_URL", '"api-online.codingblocks.xyz"'
7677

7778
}
7879
release {
7980
signingConfig signingConfigs.release
8081
minifyEnabled true
8182
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
83+
buildConfigField "String", "BASE_URL", '"online-api.codingblocks.com"'
8284

8385
}
8486
}

‎app/src/main/java/com/codingblocks/cbonlineapp/CBOnlineApp.kt

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,21 @@ import com.codingblocks.cbonlineapp.mycourse.MyCourseActivity
1717
import com.codingblocks.cbonlineapp.mycourse.content.player.VideoPlayerActivity
1818
import com.codingblocks.cbonlineapp.tracks.LearningTracksActivity
1919
import com.codingblocks.cbonlineapp.tracks.TrackActivity
20-
import com.codingblocks.cbonlineapp.util.*
20+
import com.codingblocks.cbonlineapp.util.ADMIN_CHANNEL_ID
21+
import com.codingblocks.cbonlineapp.util.CONTENT_ID
22+
import com.codingblocks.cbonlineapp.util.COURSE_ID
23+
import com.codingblocks.cbonlineapp.util.DOWNLOAD_CHANNEL_ID
24+
import com.codingblocks.cbonlineapp.util.PreferenceHelper
25+
import com.codingblocks.cbonlineapp.util.RUN_ATTEMPT_ID
26+
import com.codingblocks.cbonlineapp.util.RUN_ID
27+
import com.codingblocks.cbonlineapp.util.SECTION_ID
2128
import com.codingblocks.cbonlineapp.util.misc.AppSignatureHelper
2229
import com.codingblocks.cbonlineapp.util.receivers.NotificationOpenedHandler
2330
import com.codingblocks.cbonlineapp.util.receivers.NotificationReceivedHandler
2431
import com.codingblocks.onlineapi.CBOnlineCommunicator
2532
import com.codingblocks.onlineapi.CBOnlineLib
2633
import com.google.firebase.crashlytics.FirebaseCrashlytics
2734
import com.onesignal.OneSignal
28-
import com.squareup.picasso.Picasso
2935
import org.jetbrains.anko.notificationManager
3036
import org.koin.android.ext.koin.androidContext
3137
import org.koin.core.context.startKoin
@@ -42,14 +48,21 @@ class CBOnlineApp : Application() {
4248
mInstance = this
4349
val prefs = PreferenceHelper.getPrefs(this)
4450

45-
CBOnlineLib.initialize(object: CBOnlineCommunicator {
51+
CBOnlineLib.initialize(object : CBOnlineCommunicator {
4652

4753
override var authJwt: String
4854
get() = prefs.SP_JWT_TOKEN_KEY
49-
set(value) { prefs.SP_JWT_TOKEN_KEY = value }
55+
set(value) {
56+
prefs.SP_JWT_TOKEN_KEY = value
57+
}
5058
override var refreshToken: String
5159
get() = prefs.SP_JWT_REFRESH_TOKEN
52-
set(value) { prefs.SP_JWT_REFRESH_TOKEN = value }
60+
set(value) {
61+
prefs.SP_JWT_REFRESH_TOKEN = value
62+
}
63+
override var baseUrl: String
64+
get() = BuildConfig.BASE_URL
65+
set(value) {}
5366

5467
})
5568

‎onlineapi/src/main/kotlin/com/codingblocks/onlineapi/CBOnlineCommunicator.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ package com.codingblocks.onlineapi
33
interface CBOnlineCommunicator {
44
var authJwt: String
55
var refreshToken: String
6+
var baseUrl:String
67
}

‎onlineapi/src/main/kotlin/com/codingblocks/onlineapi/Clients.kt

Lines changed: 43 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,46 @@ package com.codingblocks.onlineapi
22

33
import com.codingblocks.onlineapi.api.OnlineJsonApi
44
import com.codingblocks.onlineapi.api.OnlineRestApi
5-
import com.codingblocks.onlineapi.models.*
5+
import com.codingblocks.onlineapi.models.Announcement
6+
import com.codingblocks.onlineapi.models.ApplicationId
7+
import com.codingblocks.onlineapi.models.Applications
8+
import com.codingblocks.onlineapi.models.Bookmark
9+
import com.codingblocks.onlineapi.models.CareerTracks
10+
import com.codingblocks.onlineapi.models.CarouselCards
11+
import com.codingblocks.onlineapi.models.Choice
12+
import com.codingblocks.onlineapi.models.CodeChallenge
13+
import com.codingblocks.onlineapi.models.Comment
14+
import com.codingblocks.onlineapi.models.Company
15+
import com.codingblocks.onlineapi.models.ContentCodeChallenge
16+
import com.codingblocks.onlineapi.models.ContentCsv
17+
import com.codingblocks.onlineapi.models.ContentDocumentType
18+
import com.codingblocks.onlineapi.models.ContentLectureType
19+
import com.codingblocks.onlineapi.models.ContentProgress
20+
import com.codingblocks.onlineapi.models.ContentQna
21+
import com.codingblocks.onlineapi.models.ContentVideoType
22+
import com.codingblocks.onlineapi.models.Course
23+
import com.codingblocks.onlineapi.models.DoubtLeaderBoard
24+
import com.codingblocks.onlineapi.models.Doubts
25+
import com.codingblocks.onlineapi.models.Instructor
26+
import com.codingblocks.onlineapi.models.JobId
27+
import com.codingblocks.onlineapi.models.Jobs
28+
import com.codingblocks.onlineapi.models.LectureContent
29+
import com.codingblocks.onlineapi.models.Note
30+
import com.codingblocks.onlineapi.models.Player
31+
import com.codingblocks.onlineapi.models.Professions
32+
import com.codingblocks.onlineapi.models.Project
33+
import com.codingblocks.onlineapi.models.Question
34+
import com.codingblocks.onlineapi.models.QuizAttempt
35+
import com.codingblocks.onlineapi.models.Quizzes
36+
import com.codingblocks.onlineapi.models.Rating
37+
import com.codingblocks.onlineapi.models.RunAttempts
38+
import com.codingblocks.onlineapi.models.Runs
39+
import com.codingblocks.onlineapi.models.Sections
40+
import com.codingblocks.onlineapi.models.SpinPrize
41+
import com.codingblocks.onlineapi.models.Spins
42+
import com.codingblocks.onlineapi.models.Tags
43+
import com.codingblocks.onlineapi.models.User
44+
import com.codingblocks.onlineapi.models.Wishlist
645
import com.fasterxml.jackson.annotation.JsonInclude
746
import com.fasterxml.jackson.annotation.JsonSetter
847
import com.fasterxml.jackson.annotation.Nulls
@@ -26,10 +65,6 @@ class Clients internal constructor(
2665
private val communicator: CBOnlineCommunicator
2766
) {
2867
companion object {
29-
private const val LOCAL = "192.168.1.13:3000"
30-
private const val DEBUG = "api-online.codingblocks.xyz"
31-
private const val PROD = "online-api.codingblocks.com"
32-
private const val URL = "online-api.codingblocks.com"
3368
const val CONNECT_TIMEOUT = 15
3469
const val READ_TIMEOUT = 15
3570
}
@@ -103,6 +138,7 @@ class Clients internal constructor(
103138
else
104139
HttpLoggingInterceptor.Level.NONE
105140
}
141+
106142
fun getHttpLogging(): Boolean = when (logging.level) {
107143
HttpLoggingInterceptor.Level.BODY -> true
108144
else -> false
@@ -124,7 +160,7 @@ class Clients internal constructor(
124160

125161
private val onlineV2JsonRetrofit = Retrofit.Builder()
126162
.client(clientInterceptor)
127-
.baseUrl("http://$DEBUG/api/v2/")
163+
.baseUrl("http://${communicator.baseUrl}/api/v2/")
128164
.addConverterFactory(JSONAPIConverterFactory(onlineApiResourceConverter))
129165
.addConverterFactory(JacksonConverterFactory.create(om))
130166
.build()
@@ -138,7 +174,7 @@ class Clients internal constructor(
138174

139175
private val retrofit = Retrofit.Builder()
140176
.client(clientInterceptor)
141-
.baseUrl("http://$DEBUG/api/")
177+
.baseUrl("http://${communicator.baseUrl}/api/")
142178
.addConverterFactory(GsonConverterFactory.create(gson))
143179
.build()
144180
val api: OnlineRestApi = retrofit.create(OnlineRestApi::class.java)

0 commit comments

Comments
 (0)