Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Game Client Android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
22
Issues
22
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Akamu
Game Client Android
Commits
49fca982
Commit
49fca982
authored
Oct 30, 2020
by
Niklas Fix
🎓
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: set baseURL depending on BuildConfig type
parent
1c9cbbcf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
app/build.gradle
app/build.gradle
+4
-0
app/src/main/java/de/akamu/tudarmstadt/api/V2API.java
app/src/main/java/de/akamu/tudarmstadt/api/V2API.java
+2
-2
No files found.
app/build.gradle
View file @
49fca982
...
...
@@ -34,7 +34,11 @@ android {
}
}
buildTypes
{
debug
{
buildConfigField
(
"String"
,
"BASE_URL"
,
'"https://dev.akamu.de/api/v2/"'
)
}
release
{
buildConfigField
(
"String"
,
"BASE_URL"
,
'"https://akamu.de/api/v2/"'
)
signingConfig
signingConfigs
.
release
minifyEnabled
false
proguardFiles
getDefaultProguardFile
(
'proguard-android.txt'
),
'proguard-rules.pro'
...
...
app/src/main/java/de/akamu/tudarmstadt/api/V2API.java
View file @
49fca982
...
...
@@ -14,6 +14,7 @@ import java.util.Map;
import
java.util.Objects
;
import
java.util.TimeZone
;
import
de.akamu.tudarmstadt.BuildConfig
;
import
de.akamu.tudarmstadt.api.interceptor.LoggingInterceptor
;
import
de.akamu.tudarmstadt.api.interceptor.TokenInterceptor
;
import
de.akamu.tudarmstadt.api.interceptor.UnauthorizedInterceptor
;
...
...
@@ -35,8 +36,7 @@ import okhttp3.Response;
public
final
class
V2API
{
private
static
final
MediaType
JSON
=
MediaType
.
parse
(
"application/json; charset=utf-8"
);
private
static
final
String
baseURL
=
"https://akamu.de/api/v2/"
;
// private static final String baseURL = "https://dev.akamu.de/api/v2/"; // Dev version of server
private
static
final
String
baseURL
=
BuildConfig
.
BASE_URL
;
private
static
String
token
=
""
;
private
static
Date
expire
;
private
static
final
OkHttpClient
client
=
new
OkHttpClient
.
Builder
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment