mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-23 06:08:46 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed TurnChecker can not authenticate (#8770)

Browse Source
This commit is contained in:
Leonard Günther
2023-02-27 15:51:27 +01:00
committed by GitHub
parent 58b3d6eaac
commit 8f7fcb2e3e
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
android/src/com/unciv/app/MultiplayerTurnCheckWorker.kt
View File

@ -24,6 +24,7 @@ import com.unciv.logic.files.UncivFiles
import com.unciv.logic.multiplayer.storage.FileStorageRateLimitReached import com.unciv.logic.multiplayer.storage.FileStorageRateLimitReached
import com.unciv.logic.multiplayer.storage.OnlineMultiplayerFiles import com.unciv.logic.multiplayer.storage.OnlineMultiplayerFiles
import com.unciv.models.metadata.GameSettingsMultiplayer import com.unciv.models.metadata.GameSettingsMultiplayer
import com.unciv.ui.screens.savescreens.Gzip
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import java.io.FileNotFoundException import java.io.FileNotFoundException
import java.io.PrintWriter import java.io.PrintWriter
@ -59,6 +60,7 @@ class MultiplayerTurnCheckWorker(appContext: Context, workerParams: WorkerParame
private const val CONFIGURED_DELAY = "CONFIGURED_DELAY" private const val CONFIGURED_DELAY = "CONFIGURED_DELAY"
private const val PERSISTENT_NOTIFICATION_ENABLED = "PERSISTENT_NOTIFICATION_ENABLED" private const val PERSISTENT_NOTIFICATION_ENABLED = "PERSISTENT_NOTIFICATION_ENABLED"
private const val FILE_STORAGE = "FILE_STORAGE" private const val FILE_STORAGE = "FILE_STORAGE"
private const val AUTH_HEADER = "AUTH_HEADER"
fun enqueue(appContext: Context, delay: Duration, inputData: Data) { fun enqueue(appContext: Context, delay: Duration, inputData: Data) {
@ -213,7 +215,8 @@ class MultiplayerTurnCheckWorker(appContext: Context, workerParams: WorkerParame
val inputData = workDataOf(Pair(FAIL_COUNT, 0), Pair(GAME_ID, gameIds), Pair(GAME_NAME, gameNames), val inputData = workDataOf(Pair(FAIL_COUNT, 0), Pair(GAME_ID, gameIds), Pair(GAME_NAME, gameNames),
Pair(USER_ID, settings.userId), Pair(CONFIGURED_DELAY, settings.turnCheckerDelay.seconds), Pair(USER_ID, settings.userId), Pair(CONFIGURED_DELAY, settings.turnCheckerDelay.seconds),
Pair(PERSISTENT_NOTIFICATION_ENABLED, settings.turnCheckerPersistentNotificationEnabled), Pair(PERSISTENT_NOTIFICATION_ENABLED, settings.turnCheckerPersistentNotificationEnabled),
Pair(FILE_STORAGE, settings.server)) Pair(FILE_STORAGE, settings.server),
Pair(AUTH_HEADER, "Basic ${Gzip.zip(settings.userId)}:${Gzip.zip(settings.passwords[settings.server] ?: "")}"))
if (settings.turnCheckerPersistentNotificationEnabled) { if (settings.turnCheckerPersistentNotificationEnabled) {
showPersistentNotification(applicationContext, "—", settings.turnCheckerDelay) showPersistentNotification(applicationContext, "—", settings.turnCheckerDelay)
@ -274,6 +277,7 @@ class MultiplayerTurnCheckWorker(appContext: Context, workerParams: WorkerParame
val showPersistNotific = inputData.getBoolean(PERSISTENT_NOTIFICATION_ENABLED, true) val showPersistNotific = inputData.getBoolean(PERSISTENT_NOTIFICATION_ENABLED, true)
val configuredDelay = getConfiguredDelay(inputData) val configuredDelay = getConfiguredDelay(inputData)
val fileStorage = inputData.getString(FILE_STORAGE) val fileStorage = inputData.getString(FILE_STORAGE)
val authHeader = inputData.getString(AUTH_HEADER)!!
try { try {
val gameIds = inputData.getStringArray(GAME_ID)!! val gameIds = inputData.getStringArray(GAME_ID)!!
@ -283,7 +287,7 @@ class MultiplayerTurnCheckWorker(appContext: Context, workerParams: WorkerParame
// to download all games to update the files so we save the first one we find // to download all games to update the files so we save the first one we find
var foundGame: Pair<String, String>? = null var foundGame: Pair<String, String>? = null
for (idx in 0 until gameIds.size){ for (idx in gameIds.indices){
val gameId = gameIds[idx] val gameId = gameIds[idx]
//gameId could be an empty string if startTurnChecker fails to load all files //gameId could be an empty string if startTurnChecker fails to load all files
if (gameId.isEmpty()) if (gameId.isEmpty())
@ -295,9 +299,9 @@ class MultiplayerTurnCheckWorker(appContext: Context, workerParams: WorkerParame
} }
try { try {
Log.d(LOG_TAG, "doWork download ${gameId}") Log.d(LOG_TAG, "doWork download $gameId")
val gamePreview = OnlineMultiplayerFiles(fileStorage).tryDownloadGamePreview(gameId) val gamePreview = OnlineMultiplayerFiles(fileStorage, mapOf("Authorization" to authHeader)).tryDownloadGamePreview(gameId)
Log.d(LOG_TAG, "doWork download ${gameId} done") Log.d(LOG_TAG, "doWork download $gameId done")
val currentTurnPlayer = gamePreview.getCivilization(gamePreview.currentPlayer) val currentTurnPlayer = gamePreview.getCivilization(gamePreview.currentPlayer)
//Save game so MultiplayerScreen gets updated //Save game so MultiplayerScreen gets updated

16
core/src/com/unciv/logic/multiplayer/storage/OnlineMultiplayerFiles.kt
View File

@ -19,20 +19,26 @@ import com.unciv.ui.screens.savescreens.Gzip
*/ */
@Suppress("RedundantSuspendModifier") // Methods can take a long time, so force users to use them in a coroutine to not get ANRs on Android @Suppress("RedundantSuspendModifier") // Methods can take a long time, so force users to use them in a coroutine to not get ANRs on Android
class OnlineMultiplayerFiles( class OnlineMultiplayerFiles(
private var fileStorageIdentifier: String? = null private var fileStorageIdentifier: String? = null,
private var authenticationHeader: Map<String, String>? = null
) { ) {
fun fileStorage(): FileStorage { fun fileStorage(): FileStorage {
val identifier = if (fileStorageIdentifier == null) UncivGame.Current.settings.multiplayer.server else fileStorageIdentifier val identifier = if (fileStorageIdentifier == null) UncivGame.Current.settings.multiplayer.server else fileStorageIdentifier
val authHeader = if (authenticationHeader == null) {
val settings = UncivGame.Current.settings.multiplayer
mapOf(
"Authorization" to "Basic ${Gzip.zip(settings.userId)}:${Gzip.zip(settings.passwords[settings.server] ?: "")}"
)
} else {
authenticationHeader
}
return if (identifier == Constants.dropboxMultiplayerServer) { return if (identifier == Constants.dropboxMultiplayerServer) {
DropBox DropBox
} else { } else {
val settings = UncivGame.Current.settings.multiplayer
UncivServerFileStorage.apply { UncivServerFileStorage.apply {
serverUrl = identifier!! serverUrl = identifier!!
authHeader = mapOf( this.authHeader = authHeader
"Authorization" to "Basic ${Gzip.zip(settings.userId)}:${Gzip.zip(settings.passwords[settings.server] ?: "")}"
)
} }
} }
} }