Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
32182b592e |
@@ -26,8 +26,8 @@ android {
|
||||
applicationId "com.example.androidbackupgui"
|
||||
minSdk 24
|
||||
targetSdk 34
|
||||
versionCode 7
|
||||
versionName "1.6"
|
||||
versionCode 8
|
||||
versionName "1.7"
|
||||
}
|
||||
buildFeatures {
|
||||
viewBinding true
|
||||
|
||||
@@ -68,7 +68,7 @@ class RestBridgeRunner {
|
||||
val bridge = ResticRestBridge(transport, remoteBase, cacheDir)
|
||||
|
||||
try {
|
||||
bridge.start(0)
|
||||
bridge.start(60_000)
|
||||
val port = bridge.listeningPort
|
||||
if (port < 0) {
|
||||
throw IllegalStateException("REST bridge failed to bind a port")
|
||||
|
||||
@@ -190,7 +190,7 @@ class ConfigViewModel(application: Application) : AndroidViewModel(application)
|
||||
viewModelScope.launch {
|
||||
try {
|
||||
_operationEvents.emit(OperationEvent.InitStarted)
|
||||
val result = withTimeoutOrNull(15 * 60 * 1000L) {
|
||||
val result = withTimeoutOrNull(60_000L) {
|
||||
ResticWrapper.init(form.repo, form.password,
|
||||
backend = form.backend, backendUrl = form.backendUrl,
|
||||
backendUser = form.backendUser, backendPass = form.backendPass,
|
||||
@@ -199,9 +199,9 @@ class ConfigViewModel(application: Application) : AndroidViewModel(application)
|
||||
}
|
||||
if (result == null) {
|
||||
_operationEvents.emit(OperationEvent.InitFailed)
|
||||
Log.w(TAG, "initResticRepo timed out after 15 minutes")
|
||||
Log.w(TAG, "initResticRepo timed out after 1 minute")
|
||||
_uiState.update { it.copy(resticStatus = it.resticStatus.copy(
|
||||
message = "初始化超时(15分钟),请检查网络/SMB 服务器是否正常"
|
||||
message = "初始化超时(1分钟),请检查网络/SMB 服务器是否正常"
|
||||
))}
|
||||
refreshResticStatus(form)
|
||||
} else if (result.isSuccess) {
|
||||
|
||||
Reference in New Issue
Block a user