Skip to content

Commit bb9dce6

Browse files
committed
modify base url [#162]
1 parent d4d2396 commit bb9dce6

File tree

4 files changed

+33
-8
lines changed

4 files changed

+33
-8
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package com.foke.together.domain.interactor.web
2+
3+
import com.foke.together.domain.interactor.entity.AccountData
4+
import com.foke.together.domain.output.RemoteRepositoryInterface
5+
import com.foke.together.util.AppLog
6+
import javax.inject.Inject
7+
8+
class RegisterUseCase @Inject constructor(
9+
private val remoteRepository: RemoteRepositoryInterface,
10+
) {
11+
suspend operator fun invoke(id: String, password: String, name: String): Result<Unit> {
12+
return remoteRepository.registerAccount(AccountData(id, password, name))
13+
.onSuccess {
14+
AppLog.i("RegisterUseCase", "init", "register success: ${it}")
15+
}.onFailure { ee ->
16+
AppLog.e("RegisterUseCase", "init", "error: ${ee}")
17+
}
18+
}
19+
}

presenter/src/main/java/com/foke/together/presenter/viewmodel/HomeViewModel.kt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import androidx.lifecycle.viewModelScope
55
import com.foke.together.domain.interactor.AppInitUseCase
66
import com.foke.together.domain.interactor.session.CreateNewSessionUseCase
77
import com.foke.together.domain.interactor.web.GetCurrentUserInformationUseCase
8+
import com.foke.together.domain.interactor.web.RegisterUseCase
89
import com.foke.together.domain.interactor.web.SignInUseCase
910
import com.foke.together.util.AppLog
1011
import com.foke.together.util.di.IODispatcher
@@ -17,6 +18,7 @@ import javax.inject.Inject
1718
class HomeViewModel @Inject constructor(
1819
@IODispatcher private val ioDispatcher: CoroutineDispatcher,
1920
private val signInUseCase: SignInUseCase,
21+
private val registerUseCase: RegisterUseCase,
2022
private val getCurrentUserInformationUseCase: GetCurrentUserInformationUseCase,
2123
private val appInitUseCase: AppInitUseCase,
2224
private val createNewSessionUseCase: CreateNewSessionUseCase
@@ -25,11 +27,18 @@ class HomeViewModel @Inject constructor(
2527
viewModelScope.launch(ioDispatcher) {
2628
// init external camera ip address
2729
appInitUseCase()
28-
2930
// TODO: this is test code. remove later
31+
32+
// TODO: add register function in Settings
33+
// registerUseCase(
34+
35+
// "1234",
36+
// "maker-faire-2025"
37+
// )
38+
3039
signInUseCase(
31-
"test@test.com",
32-
"1234"
40+
"maker-faire-2025@test.com",
41+
"1234",
3342
)
3443
// TODO: this is test code. remove later
3544
getCurrentUserInformationUseCase()

presenter/src/main/java/com/foke/together/presenter/viewmodel/ShareViewModel.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ package com.foke.together.presenter.viewmodel
33
import android.content.Context
44
import android.graphics.Bitmap
55
import android.net.Uri
6-
import androidx.compose.runtime.getValue
7-
import androidx.compose.runtime.mutableStateOf
8-
import androidx.compose.runtime.setValue
96
import androidx.core.content.FileProvider
107
import androidx.core.net.toFile
118
import androidx.lifecycle.ViewModel
@@ -71,7 +68,7 @@ class ShareViewModel @Inject constructor(
7168
val result = uploadFileUseCase(sessionKey, singleImageUri.toFile())
7269
AppLog.d(TAG, "generateQRcode" ,"result: $result")
7370

74-
val downloadUrl: String = getDownloadUrlUseCase(sessionKey).getOrElse { "https://foke.clon.dev" }
71+
val downloadUrl: String = getDownloadUrlUseCase(sessionKey).getOrElse { AppPolicy.WEB_SERVER_URL }
7572
if (AppPolicy.isDebugMode) {
7673
AppLog.e(TAG, "generateQRcode", "sessionKey: $sessionKey")
7774
AppLog.e(TAG, "generateQRcode", "downloadUrl: $downloadUrl")

util/src/main/java/com/foke/together/util/AppPolicy.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ object AppPolicy {
77
const val isNoCameraDebugMode = false // TODO: change to false
88

99
// network
10-
const val WEB_SERVER_URL = "https://4cuts.store/"
10+
const val WEB_SERVER_URL = "https://4cut.us/"
1111
const val WEB_CONNECT_TIMEOUT = 10L
1212
const val WEB_READ_TIMEOUT = 10L
1313
const val WEB_WRITE_TIMEOUT = 10L

0 commit comments

Comments
 (0)