atridad/Ascently
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 81 Activity

Logging overhaul

Browse Source
This commit is contained in:
Atridad Lahiji
2025-11-18 12:58:45 -07:00
parent c2f95f2793
commit 6d67ae6d81
25 changed files with 1428 additions and 1205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
android/app/src/main/java/com/atridad/ascently/data/health/HealthConnectStub.kt
View File

@@ -3,7 +3,7 @@ package com.atridad.ascently.data.health
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import android.content.SharedPreferences import android.content.SharedPreferences
import android.util.Log import com.atridad.ascently.utils.AppLogger
import androidx.activity.result.contract.ActivityResultContract import androidx.activity.result.contract.ActivityResultContract
import androidx.health.connect.client.HealthConnectClient import androidx.health.connect.client.HealthConnectClient
import androidx.health.connect.client.PermissionController import androidx.health.connect.client.PermissionController
@@ -60,7 +60,7 @@ class HealthConnectManager(private val context: Context) {
try { try {
HealthConnectClient.getOrCreate(context) HealthConnectClient.getOrCreate(context)
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG, "Failed to create Health Connect client", e) AppLogger.e(TAG, e) { "Failed to create Health Connect client" }
_isCompatible.value = false _isCompatible.value = false
null null
} }
@@ -75,7 +75,7 @@ class HealthConnectManager(private val context: Context) {
val status = HealthConnectClient.getSdkStatus(context) val status = HealthConnectClient.getSdkStatus(context)
emit(status == HealthConnectClient.SDK_AVAILABLE) emit(status == HealthConnectClient.SDK_AVAILABLE)
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG, "Error checking Health Connect availability", e) AppLogger.e(TAG, e) { "Error checking Health Connect availability" }
_isCompatible.value = false _isCompatible.value = false
emit(false) emit(false)
} }
@@ -90,10 +90,10 @@ class HealthConnectManager(private val context: Context) {
try { try {
val alreadyHasPermissions = hasAllPermissions() val alreadyHasPermissions = hasAllPermissions()
if (!alreadyHasPermissions) { if (!alreadyHasPermissions) {
Log.d(TAG, "Health Connect enabled - permissions will be requested by UI") AppLogger.d(TAG) { "Health Connect enabled - permissions will be requested by UI" }
} }
} catch (e: Exception) { } catch (e: Exception) {
Log.w(TAG, "Error checking permissions when enabling Health Connect", e) AppLogger.w(TAG, e) { "Error checking permissions when enabling Health Connect" }
} }
} else if (!enabled) { } else if (!enabled) {
setPermissionsGranted(false) setPermissionsGranted(false)
@@ -119,7 +119,7 @@ class HealthConnectManager(private val context: Context) {
setPermissionsGranted(hasAll) setPermissionsGranted(hasAll)
hasAll hasAll
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG, "Error checking permissions", e) AppLogger.e(TAG, e) { "Error checking permissions" }
setPermissionsGranted(false) setPermissionsGranted(false)
false false
} }
@@ -135,7 +135,7 @@ class HealthConnectManager(private val context: Context) {
val hasPerms = if (isAvailable) hasAllPermissions() else false val hasPerms = if (isAvailable) hasAllPermissions() else false
isAvailable && hasPerms isAvailable && hasPerms
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG, "Error checking Health Connect readiness", e) AppLogger.e(TAG, e) { "Error checking Health Connect readiness" }
false false
} }
} }
@@ -148,7 +148,7 @@ class HealthConnectManager(private val context: Context) {
return try { return try {
REQUIRED_PERMISSIONS.map { it }.toSet() REQUIRED_PERMISSIONS.map { it }.toSet()
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG, "Error getting required permissions", e) AppLogger.e(TAG, e) { "Error getting required permissions" }
emptySet() emptySet()
} }
} }
@@ -181,7 +181,7 @@ class HealthConnectManager(private val context: Context) {
) )
} }
Log.d(TAG, "Attempting to sync session '${session.id}' to Health Connect...") AppLogger.d(TAG) { "Attempting to sync session '${session.id}' to Health Connect..." }
val records = mutableListOf<androidx.health.connect.client.records.Record>() val records = mutableListOf<androidx.health.connect.client.records.Record>()
@@ -199,7 +199,7 @@ class HealthConnectManager(private val context: Context) {
) )
records.add(exerciseSession) records.add(exerciseSession)
} catch (e: Exception) { } catch (e: Exception) {
Log.w(TAG, "Failed to create exercise session record", e) AppLogger.w(TAG, e) { "Failed to create exercise session record" }
} }
try { try {
@@ -220,23 +220,22 @@ class HealthConnectManager(private val context: Context) {
records.add(caloriesRecord) records.add(caloriesRecord)
} }
} catch (e: Exception) { } catch (e: Exception) {
Log.w(TAG, "Failed to create calories record", e) AppLogger.w(TAG, e) { "Failed to create calories record" }
} }
try { try {
val heartRateRecord = createHeartRateRecord(startTime, endTime, attemptCount) val heartRateRecord = createHeartRateRecord(startTime, endTime, attemptCount)
heartRateRecord?.let { records.add(it) } heartRateRecord?.let { records.add(it) }
} catch (e: Exception) { } catch (e: Exception) {
Log.w(TAG, "Failed to create heart rate record", e) AppLogger.w(TAG, e) { "Failed to create heart rate record" }
} }
if (records.isNotEmpty() && healthConnectClient != null) { if (records.isNotEmpty() && healthConnectClient != null) {
Log.d(TAG, "Writing ${records.size} records to Health Connect...") AppLogger.d(TAG) { "Writing ${records.size} records to Health Connect..." }
healthConnectClient!!.insertRecords(records) healthConnectClient!!.insertRecords(records)
Log.i( AppLogger.i(TAG) {
TAG,
"Successfully synced ${records.size} records for session '${session.id}' to Health Connect" "Successfully synced ${records.size} records for session '${session.id}' to Health Connect"
) }
preferences preferences
.edit() .edit()
@@ -249,13 +248,13 @@ class HealthConnectManager(private val context: Context) {
healthConnectClient == null -> "Health Connect client unavailable" healthConnectClient == null -> "Health Connect client unavailable"
else -> "Unknown reason" else -> "Unknown reason"
} }
Log.w(TAG, "Sync failed for session '${session.id}': $reason") AppLogger.w(TAG) { "Sync failed for session '${session.id}': $reason" }
return Result.failure(Exception("Sync failed: $reason")) return Result.failure(Exception("Sync failed: $reason"))
} }
Result.success(Unit) Result.success(Unit)
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG, "Error syncing climbing session to Health Connect", e) AppLogger.e(TAG, e) { "Error syncing climbing session to Health Connect" }
Result.failure(e) Result.failure(e)
} }
} }
@@ -266,7 +265,7 @@ class HealthConnectManager(private val context: Context) {
attemptCount: Int = 0 attemptCount: Int = 0
): Result<Unit> { ): Result<Unit> {
return if (_autoSync.value && isReady() && session.status == SessionStatus.COMPLETED) { return if (_autoSync.value && isReady() && session.status == SessionStatus.COMPLETED) {
Log.d(TAG, "Auto-syncing completed session '${session.id}' to Health Connect...") AppLogger.d(TAG) { "Auto-syncing completed session '${session.id}' to Health Connect..." }
syncCompletedSession(session, gymName, attemptCount) syncCompletedSession(session, gymName, attemptCount)
} else { } else {
val reason = val reason =
@@ -276,7 +275,7 @@ class HealthConnectManager(private val context: Context) {
!isReady() -> "Health Connect not ready" !isReady() -> "Health Connect not ready"
else -> "unknown reason" else -> "unknown reason"
} }
Log.d(TAG, "Auto-sync skipped for session '${session.id}': $reason") AppLogger.d(TAG) { "Auto-sync skipped for session '${session.id}': $reason" }
Result.success(Unit) Result.success(Unit)
} }
} }
@@ -328,7 +327,7 @@ class HealthConnectManager(private val context: Context) {
samples = samples samples = samples
) )
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG, "Error creating heart rate record", e) AppLogger.e(TAG, e) { "Error creating heart rate record" }
null null
} }
} }

17
android/app/src/main/java/com/atridad/ascently/data/repository/ClimbRepository.kt
View File

@@ -13,6 +13,7 @@ import com.atridad.ascently.data.format.DeletedItem
import com.atridad.ascently.data.model.* import com.atridad.ascently.data.model.*
import com.atridad.ascently.data.state.DataStateManager import com.atridad.ascently.data.state.DataStateManager
import com.atridad.ascently.utils.DateFormatUtils import com.atridad.ascently.utils.DateFormatUtils
import com.atridad.ascently.utils.AppLogger
import com.atridad.ascently.utils.ZipExportImportUtils import com.atridad.ascently.utils.ZipExportImportUtils
import java.io.File import java.io.File
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
@@ -43,11 +44,13 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
dataStateManager.updateDataState() dataStateManager.updateDataState()
triggerAutoSync() triggerAutoSync()
} }
suspend fun updateGym(gym: Gym) { suspend fun updateGym(gym: Gym) {
gymDao.updateGym(gym) gymDao.updateGym(gym)
dataStateManager.updateDataState() dataStateManager.updateDataState()
triggerAutoSync() triggerAutoSync()
} }
suspend fun deleteGym(gym: Gym) { suspend fun deleteGym(gym: Gym) {
gymDao.deleteGym(gym) gymDao.deleteGym(gym)
trackDeletion(gym.id, "gym") trackDeletion(gym.id, "gym")
@@ -63,10 +66,12 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
problemDao.insertProblem(problem) problemDao.insertProblem(problem)
dataStateManager.updateDataState() dataStateManager.updateDataState()
} }
suspend fun updateProblem(problem: Problem) { suspend fun updateProblem(problem: Problem) {
problemDao.updateProblem(problem) problemDao.updateProblem(problem)
dataStateManager.updateDataState() dataStateManager.updateDataState()
} }
suspend fun deleteProblem(problem: Problem) { suspend fun deleteProblem(problem: Problem) {
problemDao.deleteProblem(problem) problemDao.deleteProblem(problem)
trackDeletion(problem.id, "problem") trackDeletion(problem.id, "problem")
@@ -78,6 +83,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
suspend fun getSessionById(id: String): ClimbSession? = sessionDao.getSessionById(id) suspend fun getSessionById(id: String): ClimbSession? = sessionDao.getSessionById(id)
fun getSessionsByGym(gymId: String): Flow<List<ClimbSession>> = fun getSessionsByGym(gymId: String): Flow<List<ClimbSession>> =
sessionDao.getSessionsByGym(gymId) sessionDao.getSessionsByGym(gymId)
suspend fun getActiveSession(): ClimbSession? = sessionDao.getActiveSession() suspend fun getActiveSession(): ClimbSession? = sessionDao.getActiveSession()
fun getActiveSessionFlow(): Flow<ClimbSession?> = sessionDao.getActiveSessionFlow() fun getActiveSessionFlow(): Flow<ClimbSession?> = sessionDao.getActiveSessionFlow()
suspend fun insertSession(session: ClimbSession) { suspend fun insertSession(session: ClimbSession) {
@@ -88,6 +94,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
triggerAutoSync() triggerAutoSync()
} }
} }
suspend fun updateSession(session: ClimbSession) { suspend fun updateSession(session: ClimbSession) {
sessionDao.updateSession(session) sessionDao.updateSession(session)
dataStateManager.updateDataState() dataStateManager.updateDataState()
@@ -96,12 +103,14 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
triggerAutoSync() triggerAutoSync()
} }
} }
suspend fun deleteSession(session: ClimbSession) { suspend fun deleteSession(session: ClimbSession) {
sessionDao.deleteSession(session) sessionDao.deleteSession(session)
trackDeletion(session.id, "session") trackDeletion(session.id, "session")
dataStateManager.updateDataState() dataStateManager.updateDataState()
triggerAutoSync() triggerAutoSync()
} }
suspend fun getLastUsedGym(): Gym? { suspend fun getLastUsedGym(): Gym? {
val recentSessions = sessionDao.getRecentSessions(1).first() val recentSessions = sessionDao.getRecentSessions(1).first()
return if (recentSessions.isNotEmpty()) { return if (recentSessions.isNotEmpty()) {
@@ -115,16 +124,20 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
fun getAllAttempts(): Flow<List<Attempt>> = attemptDao.getAllAttempts() fun getAllAttempts(): Flow<List<Attempt>> = attemptDao.getAllAttempts()
fun getAttemptsBySession(sessionId: String): Flow<List<Attempt>> = fun getAttemptsBySession(sessionId: String): Flow<List<Attempt>> =
attemptDao.getAttemptsBySession(sessionId) attemptDao.getAttemptsBySession(sessionId)
fun getAttemptsByProblem(problemId: String): Flow<List<Attempt>> = fun getAttemptsByProblem(problemId: String): Flow<List<Attempt>> =
attemptDao.getAttemptsByProblem(problemId) attemptDao.getAttemptsByProblem(problemId)
suspend fun insertAttempt(attempt: Attempt) { suspend fun insertAttempt(attempt: Attempt) {
attemptDao.insertAttempt(attempt) attemptDao.insertAttempt(attempt)
dataStateManager.updateDataState() dataStateManager.updateDataState()
} }
suspend fun updateAttempt(attempt: Attempt) { suspend fun updateAttempt(attempt: Attempt) {
attemptDao.updateAttempt(attempt) attemptDao.updateAttempt(attempt)
dataStateManager.updateDataState() dataStateManager.updateDataState()
} }
suspend fun deleteAttempt(attempt: Attempt) { suspend fun deleteAttempt(attempt: Attempt) {
attemptDao.deleteAttempt(attempt) attemptDao.deleteAttempt(attempt)
trackDeletion(attempt.id, "attempt") trackDeletion(attempt.id, "attempt")
@@ -386,10 +399,10 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
if (imagesDir.exists() && imagesDir.isDirectory) { if (imagesDir.exists() && imagesDir.isDirectory) {
val deletedCount = imagesDir.listFiles()?.size ?: 0 val deletedCount = imagesDir.listFiles()?.size ?: 0
imagesDir.deleteRecursively() imagesDir.deleteRecursively()
android.util.Log.i("ClimbRepository", "Cleared $deletedCount image files") AppLogger.i("ClimbRepository") { "Cleared $deletedCount image files" }
} }
} catch (e: Exception) { } catch (e: Exception) {
android.util.Log.w("ClimbRepository", "Failed to clear some images: ${e.message}") AppLogger.w("ClimbRepository", e) { "Failed to clear some images: ${e.message}" }
} }
} }
} }

6
android/app/src/main/java/com/atridad/ascently/data/state/DataStateManager.kt
View File

@@ -2,8 +2,8 @@ package com.atridad.ascently.data.state
import android.content.Context import android.content.Context
import android.content.SharedPreferences import android.content.SharedPreferences
import android.util.Log
import androidx.core.content.edit import androidx.core.content.edit
import com.atridad.ascently.utils.AppLogger
import com.atridad.ascently.utils.DateFormatUtils import com.atridad.ascently.utils.DateFormatUtils
/** /**
@@ -26,7 +26,7 @@ class DataStateManager(context: Context) {
if (!isInitialized()) { if (!isInitialized()) {
updateDataState() updateDataState()
markAsInitialized() markAsInitialized()
Log.d(TAG, "DataStateManager initialized with timestamp: ${getLastModified()}") AppLogger.d(TAG) { "DataStateManager initialized with timestamp: ${getLastModified()}" }
} }
} }
@@ -37,7 +37,7 @@ class DataStateManager(context: Context) {
fun updateDataState() { fun updateDataState() {
val now = DateFormatUtils.nowISO8601() val now = DateFormatUtils.nowISO8601()
prefs.edit { putString(KEY_LAST_MODIFIED, now) } prefs.edit { putString(KEY_LAST_MODIFIED, now) }
Log.d(TAG, "Data state updated to: $now") AppLogger.d(TAG) { "Data state updated to: $now" }
} }
/** /**

72
android/app/src/main/java/com/atridad/ascently/data/sync/SyncService.kt
View File

@@ -4,10 +4,10 @@ import android.content.Context
import android.content.SharedPreferences import android.content.SharedPreferences
import android.net.ConnectivityManager import android.net.ConnectivityManager
import android.net.NetworkCapabilities import android.net.NetworkCapabilities
import android.util.Log
import androidx.annotation.RequiresPermission import androidx.annotation.RequiresPermission
import androidx.core.content.edit import androidx.core.content.edit
import com.atridad.ascently.data.format.BackupAttempt import com.atridad.ascently.data.format.BackupAttempt
import com.atridad.ascently.utils.AppLogger
import com.atridad.ascently.data.format.BackupClimbSession import com.atridad.ascently.data.format.BackupClimbSession
import com.atridad.ascently.data.format.BackupGym import com.atridad.ascently.data.format.BackupGym
import com.atridad.ascently.data.format.BackupProblem import com.atridad.ascently.data.format.BackupProblem
@@ -164,12 +164,12 @@ class SyncService(private val context: Context, private val repository: ClimbRep
@RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
suspend fun syncWithServer() { suspend fun syncWithServer() {
if (isOfflineMode) { if (isOfflineMode) {
Log.d(TAG, "Sync skipped: Offline mode is enabled.") AppLogger.d(TAG) { "Sync skipped: Offline mode is enabled." }
return return
} }
if (!isNetworkAvailable()) { if (!isNetworkAvailable()) {
_syncError.value = "No internet connection." _syncError.value = "No internet connection."
Log.d(TAG, "Sync skipped: No internet connection.") AppLogger.d(TAG) { "Sync skipped: No internet connection." }
return return
} }
if (!_isConfigured.value) { if (!_isConfigured.value) {
@@ -202,29 +202,32 @@ class SyncService(private val context: Context, private val repository: ClimbRep
// If both client and server have been synced before, use delta sync // If both client and server have been synced before, use delta sync
val lastSyncTimeStr = sharedPreferences.getString(Keys.LAST_SYNC_TIME, null) val lastSyncTimeStr = sharedPreferences.getString(Keys.LAST_SYNC_TIME, null)
if (hasLocalData && hasServerData && lastSyncTimeStr != null) { if (hasLocalData && hasServerData && lastSyncTimeStr != null) {
Log.d(TAG, "Using delta sync for incremental updates") AppLogger.d(TAG) { "Using delta sync for incremental updates" }
performDeltaSync(lastSyncTimeStr) performDeltaSync(lastSyncTimeStr)
} else { } else {
when { when {
!hasLocalData && hasServerData -> { !hasLocalData && hasServerData -> {
Log.d(TAG, "No local data found, performing full restore from server") AppLogger.d(TAG) { "No local data found, performing full restore from server" }
val imagePathMapping = syncImagesFromServer(serverBackup) val imagePathMapping = syncImagesFromServer(serverBackup)
importBackupToRepository(serverBackup, imagePathMapping) importBackupToRepository(serverBackup, imagePathMapping)
Log.d(TAG, "Full restore completed") AppLogger.d(TAG) { "Full restore completed" }
} }
hasLocalData && !hasServerData -> { hasLocalData && !hasServerData -> {
Log.d(TAG, "No server data found, uploading local data to server") AppLogger.d(TAG) { "No server data found, uploading local data to server" }
uploadData(localBackup) uploadData(localBackup)
syncImagesForBackup(localBackup) syncImagesForBackup(localBackup)
Log.d(TAG, "Initial upload completed") AppLogger.d(TAG) { "Initial upload completed" }
} }
hasLocalData && hasServerData -> { hasLocalData && hasServerData -> {
Log.d(TAG, "Both local and server data exist, merging (server wins)") AppLogger.d(TAG) { "Both local and server data exist, merging (server wins)" }
mergeDataSafely(serverBackup) mergeDataSafely(serverBackup)
Log.d(TAG, "Merge completed") AppLogger.d(TAG) { "Merge completed" }
} }
else -> { else -> {
Log.d(TAG, "No data to sync") AppLogger.d(TAG) { "No data to sync" }
} }
} }
} }
@@ -242,7 +245,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
} }
private suspend fun performDeltaSync(lastSyncTimeStr: String) { private suspend fun performDeltaSync(lastSyncTimeStr: String) {
Log.d(TAG, "Starting delta sync with lastSyncTime=$lastSyncTimeStr") AppLogger.d(TAG) { "Starting delta sync with lastSyncTime=$lastSyncTimeStr" }
// Parse last sync time to filter modified items // Parse last sync time to filter modified items
val lastSyncDate = parseISO8601(lastSyncTimeStr) ?: Date(0) val lastSyncDate = parseISO8601(lastSyncTimeStr) ?: Date(0)
@@ -295,10 +298,9 @@ class SyncService(private val context: Context, private val repository: ClimbRep
parseISO8601(item.deletedAt)?.after(lastSyncDate) == true parseISO8601(item.deletedAt)?.after(lastSyncDate) == true
} }
Log.d( AppLogger.d(TAG) {
TAG,
"Delta sync sending: gyms=${modifiedGyms.size}, problems=${modifiedProblems.size}, sessions=${modifiedSessions.size}, attempts=${modifiedAttempts.size}, deletions=${modifiedDeletions.size}" "Delta sync sending: gyms=${modifiedGyms.size}, problems=${modifiedProblems.size}, sessions=${modifiedSessions.size}, attempts=${modifiedAttempts.size}, deletions=${modifiedDeletions.size}"
) }
// Create delta request // Create delta request
val deltaRequest = val deltaRequest =
@@ -342,10 +344,9 @@ class SyncService(private val context: Context, private val repository: ClimbRep
} }
} }
Log.d( AppLogger.d(TAG) {
TAG,
"Delta sync received: gyms=${deltaResponse.gyms.size}, problems=${deltaResponse.problems.size}, sessions=${deltaResponse.sessions.size}, attempts=${deltaResponse.attempts.size}, deletions=${deltaResponse.deletedItems.size}" "Delta sync received: gyms=${deltaResponse.gyms.size}, problems=${deltaResponse.problems.size}, sessions=${deltaResponse.sessions.size}, attempts=${deltaResponse.attempts.size}, deletions=${deltaResponse.deletedItems.size}"
) }
// Apply server changes to local data // Apply server changes to local data
applyDeltaResponse(deltaResponse) applyDeltaResponse(deltaResponse)
@@ -372,7 +373,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
val allDeletions = repository.getDeletedItems() + response.deletedItems val allDeletions = repository.getDeletedItems() + response.deletedItems
val uniqueDeletions = allDeletions.distinctBy { "${it.type}:${it.id}" } val uniqueDeletions = allDeletions.distinctBy { "${it.type}:${it.id}" }
Log.d(TAG, "Applying ${uniqueDeletions.size} deletion records before merging data") AppLogger.d(TAG) { "Applying ${uniqueDeletions.size} deletion records before merging data" }
applyDeletions(uniqueDeletions) applyDeletions(uniqueDeletions)
// Build deleted item lookup set // Build deleted item lookup set
@@ -392,7 +393,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
imagePathMapping[imagePath] = localImagePath imagePathMapping[imagePath] = localImagePath
} }
} catch (e: Exception) { } catch (e: Exception) {
Log.w(TAG, "Failed to download image $imagePath: ${e.message}") AppLogger.w(TAG) { "Failed to download image $imagePath: ${e.message}" }
} }
} }
} }
@@ -496,12 +497,15 @@ class SyncService(private val context: Context, private val repository: ClimbRep
"gym" -> { "gym" -> {
existingGyms.find { it.id == item.id }?.let { repository.deleteGym(it) } existingGyms.find { it.id == item.id }?.let { repository.deleteGym(it) }
} }
"problem" -> { "problem" -> {
existingProblems.find { it.id == item.id }?.let { repository.deleteProblem(it) } existingProblems.find { it.id == item.id }?.let { repository.deleteProblem(it) }
} }
"session" -> { "session" -> {
existingSessions.find { it.id == item.id }?.let { repository.deleteSession(it) } existingSessions.find { it.id == item.id }?.let { repository.deleteSession(it) }
} }
"attempt" -> { "attempt" -> {
existingAttempts.find { it.id == item.id }?.let { repository.deleteAttempt(it) } existingAttempts.find { it.id == item.id }?.let { repository.deleteAttempt(it) }
} }
@@ -512,7 +516,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
private suspend fun syncModifiedImages(modifiedProblems: List<BackupProblem>) { private suspend fun syncModifiedImages(modifiedProblems: List<BackupProblem>) {
if (modifiedProblems.isEmpty()) return if (modifiedProblems.isEmpty()) return
Log.d(TAG, "Syncing images for ${modifiedProblems.size} modified problems") AppLogger.d(TAG) { "Syncing images for ${modifiedProblems.size} modified problems" }
for (backupProblem in modifiedProblems) { for (backupProblem in modifiedProblems) {
backupProblem.imagePaths?.forEach { imagePath -> backupProblem.imagePaths?.forEach { imagePath ->
@@ -583,7 +587,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
private suspend fun syncImagesFromServer(backup: ClimbDataBackup): Map<String, String> { private suspend fun syncImagesFromServer(backup: ClimbDataBackup): Map<String, String> {
val imagePathMapping = mutableMapOf<String, String>() val imagePathMapping = mutableMapOf<String, String>()
val totalImages = backup.problems.sumOf { it.imagePaths?.size ?: 0 } val totalImages = backup.problems.sumOf { it.imagePaths?.size ?: 0 }
Log.d(TAG, "Starting image download from server for $totalImages images") AppLogger.d(TAG) { "Starting image download from server for $totalImages images" }
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
backup.problems.forEach { problem -> backup.problems.forEach { problem ->
@@ -595,9 +599,9 @@ class SyncService(private val context: Context, private val repository: ClimbRep
imagePathMapping[imagePath] = localImagePath imagePathMapping[imagePath] = localImagePath
} }
} catch (_: SyncException.ImageNotFound) { } catch (_: SyncException.ImageNotFound) {
Log.w(TAG, "Image not found on server: $imagePath") AppLogger.w(TAG) { "Image not found on server: $imagePath" }
} catch (e: Exception) { } catch (e: Exception) {
Log.w(TAG, "Failed to download image $imagePath: ${e.message}") AppLogger.w(TAG) { "Failed to download image $imagePath: ${e.message}" }
} }
} }
} }
@@ -625,14 +629,14 @@ class SyncService(private val context: Context, private val repository: ClimbRep
} }
} }
} catch (e: IOException) { } catch (e: IOException) {
Log.e(TAG, "Network error downloading image $serverFilename", e) AppLogger.e(TAG, e) { "Network error downloading image $serverFilename" }
null null
} }
} }
} }
private suspend fun syncImagesForBackup(backup: ClimbDataBackup) { private suspend fun syncImagesForBackup(backup: ClimbDataBackup) {
Log.d(TAG, "Starting image sync for backup with ${backup.problems.size} problems") AppLogger.d(TAG) { "Starting image sync for backup with ${backup.problems.size} problems" }
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
backup.problems.forEach { problem -> backup.problems.forEach { problem ->
problem.imagePaths?.forEach { localPath -> problem.imagePaths?.forEach { localPath ->
@@ -646,7 +650,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
private suspend fun uploadImage(localPath: String, filename: String) { private suspend fun uploadImage(localPath: String, filename: String) {
val file = ImageUtils.getImageFile(context, localPath) val file = ImageUtils.getImageFile(context, localPath)
if (!file.exists()) { if (!file.exists()) {
Log.w(TAG, "Local image file not found, cannot upload: $localPath") AppLogger.w(TAG) { "Local image file not found, cannot upload: $localPath" }
return return
} }
@@ -663,16 +667,15 @@ class SyncService(private val context: Context, private val repository: ClimbRep
try { try {
httpClient.newCall(request).execute().use { response -> httpClient.newCall(request).execute().use { response ->
if (response.isSuccessful) { if (response.isSuccessful) {
Log.d(TAG, "Successfully uploaded image: $filename") AppLogger.d(TAG) { "Successfully uploaded image: $filename" }
} else { } else {
Log.w( AppLogger.w(TAG) {
TAG,
"Failed to upload image $filename. Server responded with ${response.code}" "Failed to upload image $filename. Server responded with ${response.code}"
) }
} }
} }
} catch (e: IOException) { } catch (e: IOException) {
Log.e(TAG, "Network error uploading image $filename", e) AppLogger.e(TAG, e) { "Network error uploading image $filename" }
} }
} }
} }
@@ -737,7 +740,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
} }
private suspend fun mergeDataSafely(serverBackup: ClimbDataBackup) { private suspend fun mergeDataSafely(serverBackup: ClimbDataBackup) {
Log.d(TAG, "Server data will overwrite local data. Performing full restore.") AppLogger.d(TAG) { "Server data will overwrite local data. Performing full restore." }
val imagePathMapping = syncImagesFromServer(serverBackup) val imagePathMapping = syncImagesFromServer(serverBackup)
importBackupToRepository(serverBackup, imagePathMapping) importBackupToRepository(serverBackup, imagePathMapping)
} }
@@ -798,7 +801,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
try { try {
syncWithServer() syncWithServer()
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG, "Auto-sync failed", e) AppLogger.e(TAG, e) { "Auto-sync failed" }
} }
if (pendingChanges) { if (pendingChanges) {
pendingChanges = false pendingChanges = false
@@ -833,5 +836,6 @@ sealed class SyncException(message: String) : IOException(message), Serializable
data class ServerError(val code: Int) : SyncException("Server error: HTTP $code") data class ServerError(val code: Int) : SyncException("Server error: HTTP $code")
data class InvalidResponse(val details: String) : data class InvalidResponse(val details: String) :
SyncException("Invalid server response: $details") SyncException("Invalid server response: $details")
data class NetworkError(val details: String) : SyncException("Network error: $details") data class NetworkError(val details: String) : SyncException("Network error: $details")
} }

15
android/app/src/main/java/com/atridad/ascently/service/SessionTrackingService.kt
View File

@@ -12,6 +12,7 @@ import com.atridad.ascently.MainActivity
import com.atridad.ascently.R import com.atridad.ascently.R
import com.atridad.ascently.data.database.AscentlyDatabase import com.atridad.ascently.data.database.AscentlyDatabase
import com.atridad.ascently.data.repository.ClimbRepository import com.atridad.ascently.data.repository.ClimbRepository
import com.atridad.ascently.utils.AppLogger
import com.atridad.ascently.widget.ClimbStatsWidgetProvider import com.atridad.ascently.widget.ClimbStatsWidgetProvider
import java.time.LocalDateTime import java.time.LocalDateTime
import java.time.temporal.ChronoUnit import java.time.temporal.ChronoUnit
@@ -29,6 +30,7 @@ class SessionTrackingService : Service() {
private lateinit var notificationManager: NotificationManager private lateinit var notificationManager: NotificationManager
companion object { companion object {
private const val LOG_TAG = "SessionTrackingService"
const val NOTIFICATION_ID = 1001 const val NOTIFICATION_ID = 1001
const val CHANNEL_ID = "session_tracking_channel" const val CHANNEL_ID = "session_tracking_channel"
const val ACTION_START_SESSION = "start_session" const val ACTION_START_SESSION = "start_session"
@@ -68,6 +70,7 @@ class SessionTrackingService : Service() {
startSessionTracking(sessionId) startSessionTracking(sessionId)
} }
} }
ACTION_STOP_SESSION -> { ACTION_STOP_SESSION -> {
val sessionId = intent.getStringExtra(EXTRA_SESSION_ID) val sessionId = intent.getStringExtra(EXTRA_SESSION_ID)
serviceScope.launch { serviceScope.launch {
@@ -108,7 +111,7 @@ class SessionTrackingService : Service() {
// Update widget when session tracking starts // Update widget when session tracking starts
ClimbStatsWidgetProvider.updateAllWidgets(this) ClimbStatsWidgetProvider.updateAllWidgets(this)
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() AppLogger.e(LOG_TAG, e) { "Failed to initialize session tracking notification" }
} }
notificationJob = notificationJob =
@@ -124,7 +127,7 @@ class SessionTrackingService : Service() {
updateNotification(sessionId) updateNotification(sessionId)
} }
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() AppLogger.e(LOG_TAG, e) { "Notification updater loop crashed" }
} }
} }
@@ -149,7 +152,7 @@ class SessionTrackingService : Service() {
} }
} }
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() AppLogger.e(LOG_TAG, e) { "Session monitoring loop crashed" }
} }
} }
} }
@@ -178,13 +181,13 @@ class SessionTrackingService : Service() {
// Update widget when notification updates // Update widget when notification updates
ClimbStatsWidgetProvider.updateAllWidgets(this) ClimbStatsWidgetProvider.updateAllWidgets(this)
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() AppLogger.e(LOG_TAG, e) { "Failed to update notification; retrying in 10s" }
try { try {
delay(10000L) delay(10000L)
createAndShowNotification(sessionId) createAndShowNotification(sessionId)
} catch (retryException: Exception) { } catch (retryException: Exception) {
retryException.printStackTrace() AppLogger.e(LOG_TAG, retryException) { "Retrying notification update failed" }
stopSessionTracking() stopSessionTracking()
} }
} }
@@ -256,7 +259,7 @@ class SessionTrackingService : Service() {
notificationManager.notify(NOTIFICATION_ID, notification) notificationManager.notify(NOTIFICATION_ID, notification)
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() AppLogger.e(LOG_TAG, e) { "Failed to build session tracking notification" }
throw e throw e
} }
} }

29
android/app/src/main/java/com/atridad/ascently/ui/AscentlyApp.kt
View File

@@ -26,6 +26,7 @@ import com.atridad.ascently.ui.components.NotificationPermissionDialog
import com.atridad.ascently.ui.screens.* import com.atridad.ascently.ui.screens.*
import com.atridad.ascently.ui.viewmodel.ClimbViewModel import com.atridad.ascently.ui.viewmodel.ClimbViewModel
import com.atridad.ascently.ui.viewmodel.ClimbViewModelFactory import com.atridad.ascently.ui.viewmodel.ClimbViewModelFactory
import com.atridad.ascently.utils.AppLogger
import com.atridad.ascently.utils.AppShortcutManager import com.atridad.ascently.utils.AppShortcutManager
import com.atridad.ascently.utils.NotificationPermissionUtils import com.atridad.ascently.utils.NotificationPermissionUtils
@@ -101,6 +102,7 @@ fun AscentlyApp(
launchSingleTop = true launchSingleTop = true
} }
} }
AppShortcutManager.ACTION_END_SESSION -> { AppShortcutManager.ACTION_END_SESSION -> {
navController.navigate(Screen.Sessions) { navController.navigate(Screen.Sessions) {
popUpTo(0) { inclusive = true } popUpTo(0) { inclusive = true }
@@ -114,10 +116,7 @@ fun AscentlyApp(
LaunchedEffect(shortcutAction, activeSession, gyms, lastUsedGym) { LaunchedEffect(shortcutAction, activeSession, gyms, lastUsedGym) {
if (shortcutAction == AppShortcutManager.ACTION_START_SESSION && gyms.isNotEmpty()) { if (shortcutAction == AppShortcutManager.ACTION_START_SESSION && gyms.isNotEmpty()) {
android.util.Log.d( AppLogger.d("AscentlyApp") { "Processing shortcut action: activeSession=$activeSession, gyms.size=${gyms.size}, lastUsedGymId=$lastUsedGymId, lastUsedGym=${lastUsedGym?.name}" }
"AscentlyApp",
"Processing shortcut action: activeSession=$activeSession, gyms.size=${gyms.size}, lastUsedGymId=$lastUsedGymId, lastUsedGym=${lastUsedGym?.name}"
)
if (activeSession == null) { if (activeSession == null) {
if (NotificationPermissionUtils.shouldRequestNotificationPermission() && if (NotificationPermissionUtils.shouldRequestNotificationPermission() &&
@@ -125,14 +124,11 @@ fun AscentlyApp(
context context
) )
) { ) {
android.util.Log.d("AscentlyApp", "Showing notification permission dialog") AppLogger.d("AscentlyApp") { "Showing notification permission dialog" }
showNotificationPermissionDialog = true showNotificationPermissionDialog = true
} else { } else {
if (gyms.size == 1) { if (gyms.size == 1) {
android.util.Log.d( AppLogger.d("AscentlyApp") { "Starting session with single gym: ${gyms.first().name}" }
"AscentlyApp",
"Starting session with single gym: ${gyms.first().name}"
)
viewModel.startSession(context, gyms.first().id) viewModel.startSession(context, gyms.first().id)
} else { } else {
val targetGym = val targetGym =
@@ -140,25 +136,16 @@ fun AscentlyApp(
?: lastUsedGym ?: lastUsedGym
if (targetGym != null) { if (targetGym != null) {
android.util.Log.d( AppLogger.d("AscentlyApp") { "Starting session with target gym: ${targetGym.name}" }
"AscentlyApp",
"Starting session with target gym: ${targetGym.name}"
)
viewModel.startSession(context, targetGym.id) viewModel.startSession(context, targetGym.id)
} else { } else {
android.util.Log.d( AppLogger.d("AscentlyApp") { "No target gym found, navigating to selection" }
"AscentlyApp",
"No target gym found, navigating to selection"
)
navController.navigate(Screen.AddEditSession()) navController.navigate(Screen.AddEditSession())
} }
} }
} }
} else { } else {
android.util.Log.d( AppLogger.d("AscentlyApp") { "Active session already exists: ${activeSession?.id}" }
"AscentlyApp",
"Active session already exists: ${activeSession?.id}"
)
} }
onShortcutActionProcessed() onShortcutActionProcessed()

26
android/app/src/main/java/com/atridad/ascently/ui/viewmodel/ClimbViewModel.kt
View File

@@ -8,6 +8,7 @@ import com.atridad.ascently.data.model.*
import com.atridad.ascently.data.repository.ClimbRepository import com.atridad.ascently.data.repository.ClimbRepository
import com.atridad.ascently.data.sync.SyncService import com.atridad.ascently.data.sync.SyncService
import com.atridad.ascently.service.SessionTrackingService import com.atridad.ascently.service.SessionTrackingService
import com.atridad.ascently.utils.AppLogger
import com.atridad.ascently.utils.ImageUtils import com.atridad.ascently.utils.ImageUtils
import com.atridad.ascently.widget.ClimbStatsWidgetProvider import com.atridad.ascently.widget.ClimbStatsWidgetProvider
import java.io.File import java.io.File
@@ -192,7 +193,7 @@ class ClimbViewModel(
} }
} }
println("Deleted $deletedCount image files and cleared image references") AppLogger.i("ClimbViewModel") { "Deleted $deletedCount image files and cleared image references" }
} }
} }
@@ -233,12 +234,12 @@ class ClimbViewModel(
// Active session management // Active session management
fun startSession(context: Context, gymId: String, notes: String? = null) { fun startSession(context: Context, gymId: String, notes: String? = null) {
viewModelScope.launch { viewModelScope.launch {
android.util.Log.d("ClimbViewModel", "startSession called with gymId: $gymId") AppLogger.d("ClimbViewModel") { "startSession called with gymId: $gymId" }
if (!com.atridad.ascently.utils.NotificationPermissionUtils if (!com.atridad.ascently.utils.NotificationPermissionUtils
.isNotificationPermissionGranted(context) .isNotificationPermissionGranted(context)
) { ) {
android.util.Log.d("ClimbViewModel", "Notification permission not granted") AppLogger.d("ClimbViewModel") { "Notification permission not granted" }
_uiState.value = _uiState.value =
_uiState.value.copy( _uiState.value.copy(
error = error =
@@ -249,10 +250,7 @@ class ClimbViewModel(
val existingActive = repository.getActiveSession() val existingActive = repository.getActiveSession()
if (existingActive != null) { if (existingActive != null) {
android.util.Log.d( AppLogger.d("ClimbViewModel") { "Active session already exists: ${existingActive.id}" }
"ClimbViewModel",
"Active session already exists: ${existingActive.id}"
)
_uiState.value = _uiState.value =
_uiState.value.copy( _uiState.value.copy(
error = "There's already an active session. Please end it first." error = "There's already an active session. Please end it first."
@@ -260,14 +258,11 @@ class ClimbViewModel(
return@launch return@launch
} }
android.util.Log.d("ClimbViewModel", "Creating new session") AppLogger.d("ClimbViewModel") { "Creating new session" }
val newSession = ClimbSession.create(gymId = gymId, notes = notes) val newSession = ClimbSession.create(gymId = gymId, notes = notes)
repository.insertSession(newSession) repository.insertSession(newSession)
android.util.Log.d( AppLogger.d("ClimbViewModel") { "Starting tracking service for session: ${newSession.id}" }
"ClimbViewModel",
"Starting tracking service for session: ${newSession.id}"
)
// Start the tracking service // Start the tracking service
val serviceIntent = SessionTrackingService.createStartIntent(context, newSession.id) val serviceIntent = SessionTrackingService.createStartIntent(context, newSession.id)
context.startForegroundService(serviceIntent) context.startForegroundService(serviceIntent)
@@ -477,15 +472,12 @@ class ClimbViewModel(
result.onFailure { error -> result.onFailure { error ->
if (healthConnectManager.isReadySync()) { if (healthConnectManager.isReadySync()) {
android.util.Log.w( AppLogger.w("ClimbViewModel") { "Health Connect sync failed: ${error.message}" }
"ClimbViewModel",
"Health Connect sync failed: ${error.message}"
)
} }
} }
} catch (e: Exception) { } catch (e: Exception) {
if (healthConnectManager.isReadySync()) { if (healthConnectManager.isReadySync()) {
android.util.Log.w("ClimbViewModel", "Health Connect sync error: ${e.message}") AppLogger.w("ClimbViewModel") { "Health Connect sync error: ${e.message}" }
} }
} }
} }

51
android/app/src/main/java/com/atridad/ascently/utils/AppLogger.kt Normal file
View File

@@ -0,0 +1,51 @@
package com.atridad.ascently.utils
import android.util.Log
import com.atridad.ascently.BuildConfig
/**
* Centralized logging utility to ensure all mobile logging happens only in debug builds.
*/
object AppLogger {
enum class Level(val androidLevel: Int) {
DEBUG(Log.DEBUG),
INFO(Log.INFO),
WARN(Log.WARN),
ERROR(Log.ERROR)
}
fun d(tag: String = DEFAULT_TAG, messageProvider: () -> String) {
log(Level.DEBUG, tag, messageProvider)
}
fun i(tag: String = DEFAULT_TAG, messageProvider: () -> String) {
log(Level.INFO, tag, messageProvider)
}
fun w(tag: String = DEFAULT_TAG, throwable: Throwable? = null, messageProvider: () -> String) {
log(Level.WARN, tag, messageProvider, throwable)
}
fun e(tag: String = DEFAULT_TAG, throwable: Throwable? = null, messageProvider: () -> String) {
log(Level.ERROR, tag, messageProvider, throwable)
}
private fun log(
level: Level,
tag: String,
messageProvider: () -> String,
throwable: Throwable? = null
) {
if (!BuildConfig.DEBUG) return
val message = messageProvider()
if (throwable != null) {
Log.println(level.androidLevel, tag, "$message\n${Log.getStackTraceString(throwable)}")
} else {
Log.println(level.androidLevel, tag, message)
}
}
private const val DEFAULT_TAG = "Ascently"
}

28
android/app/src/main/java/com/atridad/ascently/utils/ImageUtils.kt
View File

@@ -6,7 +6,6 @@ import android.graphics.Bitmap
import android.graphics.BitmapFactory import android.graphics.BitmapFactory
import android.graphics.ImageDecoder import android.graphics.ImageDecoder
import android.net.Uri import android.net.Uri
import android.util.Log
import androidx.core.graphics.scale import androidx.core.graphics.scale
import androidx.exifinterface.media.ExifInterface import androidx.exifinterface.media.ExifInterface
import java.io.File import java.io.File
@@ -73,7 +72,7 @@ object ImageUtils {
compressedBitmap.recycle() compressedBitmap.recycle()
true true
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() AppLogger.e("ImageUtils", e) { "Error saving image with EXIF data" }
false false
} }
} }
@@ -119,7 +118,7 @@ object ImageUtils {
val file = getImageFile(context, relativePath) val file = getImageFile(context, relativePath)
file.delete() file.delete()
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() AppLogger.e("ImageUtils", e) { "Failed to delete image: $relativePath" }
false false
} }
} }
@@ -137,7 +136,7 @@ object ImageUtils {
sourceFile.copyTo(destFile, overwrite = true) sourceFile.copyTo(destFile, overwrite = true)
"$IMAGES_DIR/$filename" "$IMAGES_DIR/$filename"
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() AppLogger.e("ImageUtils", e) { "Failed to import image from source: ${sourceFile.name}" }
null null
} }
} }
@@ -157,7 +156,7 @@ object ImageUtils {
} }
?: emptyList() ?: emptyList()
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() AppLogger.e("ImageUtils", e) { "Failed to enumerate images directory" }
emptyList() emptyList()
} }
} }
@@ -178,7 +177,7 @@ object ImageUtils {
tempFilename tempFilename
} catch (e: Exception) { } catch (e: Exception) {
Log.e("ImageUtils", "Error saving temporary image from URI", e) AppLogger.e("ImageUtils", e) { "Error saving temporary image from URI" }
null null
} }
} }
@@ -193,7 +192,7 @@ object ImageUtils {
return try { return try {
val tempFile = File(getImagesDirectory(context), tempFilename) val tempFile = File(getImagesDirectory(context), tempFilename)
if (!tempFile.exists()) { if (!tempFile.exists()) {
Log.e("ImageUtils", "Temporary file does not exist: $tempFilename") AppLogger.e("ImageUtils") { "Temporary file does not exist: $tempFilename" }
return null return null
} }
@@ -202,17 +201,14 @@ object ImageUtils {
val finalFile = File(getImagesDirectory(context), deterministicFilename) val finalFile = File(getImagesDirectory(context), deterministicFilename)
if (tempFile.renameTo(finalFile)) { if (tempFile.renameTo(finalFile)) {
Log.d( AppLogger.d("ImageUtils") { "Renamed temporary image: $tempFilename -> $deterministicFilename" }
"ImageUtils",
"Renamed temporary image: $tempFilename -> $deterministicFilename"
)
deterministicFilename deterministicFilename
} else { } else {
Log.e("ImageUtils", "Failed to rename temporary image: $tempFilename") AppLogger.e("ImageUtils") { "Failed to rename temporary image: $tempFilename" }
null null
} }
} catch (e: Exception) { } catch (e: Exception) {
Log.e("ImageUtils", "Error renaming temporary image", e) AppLogger.e("ImageUtils", e) { "Error renaming temporary image" }
null null
} }
} }
@@ -249,7 +245,7 @@ object ImageUtils {
destExif.saveAttributes() destExif.saveAttributes()
} catch (e: Exception) { } catch (e: Exception) {
// If EXIF preservation fails, continue without it // If EXIF preservation fails, continue without it
Log.w("ImageUtils", "Failed to preserve EXIF data: ${e.message}") AppLogger.w("ImageUtils") { "Failed to preserve EXIF data: ${e.message}" }
} }
bitmap.recycle() bitmap.recycle()
@@ -262,7 +258,7 @@ object ImageUtils {
// Return relative path // Return relative path
"$IMAGES_DIR/$filename" "$IMAGES_DIR/$filename"
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() AppLogger.e("ImageUtils", e) { "Failed to save image from bytes: $filename" }
null null
} }
} }
@@ -275,7 +271,7 @@ object ImageUtils {
orphanedImages.forEach { path -> deleteImage(context, path) } orphanedImages.forEach { path -> deleteImage(context, path) }
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() AppLogger.e("ImageUtils", e) { "Failed to clean up orphaned images" }
} }
} }
} }

21
android/app/src/main/java/com/atridad/ascently/utils/MigrationManager.kt
View File

@@ -2,7 +2,6 @@ package com.atridad.ascently.utils
import android.content.Context import android.content.Context
import android.content.SharedPreferences import android.content.SharedPreferences
import android.util.Log
import androidx.core.content.edit import androidx.core.content.edit
class MigrationManager(private val context: Context) { class MigrationManager(private val context: Context) {
@@ -22,11 +21,11 @@ class MigrationManager(private val context: Context) {
*/ */
fun migrateIfNeeded() { fun migrateIfNeeded() {
if (migrationPrefs.getBoolean(MIGRATION_COMPLETED_KEY, false)) { if (migrationPrefs.getBoolean(MIGRATION_COMPLETED_KEY, false)) {
Log.d(TAG, "Migration already completed, skipping") AppLogger.d(TAG) { "Migration already completed, skipping" }
return return
} }
Log.i(TAG, "🔄 Starting migration from OpenClimb to Ascently...") AppLogger.i(TAG) { "🔄 Starting migration from OpenClimb to Ascently..." }
var migrationCount = 0 var migrationCount = 0
// Migrate SharedPreferences // Migrate SharedPreferences
@@ -36,12 +35,9 @@ class MigrationManager(private val context: Context) {
migrationPrefs.edit { putBoolean(MIGRATION_COMPLETED_KEY, true) } migrationPrefs.edit { putBoolean(MIGRATION_COMPLETED_KEY, true) }
if (migrationCount > 0) { if (migrationCount > 0) {
Log.i( AppLogger.i(TAG) { "🎉 Migration completed! Migrated $migrationCount items from OpenClimb to Ascently" }
TAG,
"🎉 Migration completed! Migrated $migrationCount items from OpenClimb to Ascently"
)
} else { } else {
Log.i(TAG, "ℹ️ No OpenClimb data found to migrate") AppLogger.i(TAG) { "ℹ️ No OpenClimb data found to migrate" }
} }
} }
@@ -95,10 +91,7 @@ class MigrationManager(private val context: Context) {
// Clear old preferences // Clear old preferences
oldPrefs.edit { clear() } oldPrefs.edit { clear() }
Log.d( AppLogger.d(TAG) { "Migrated preference file: $oldFileName → $newFileName (${oldPrefs.all.size} keys)" }
TAG,
"✅ Migrated preference file: $oldFileName → $newFileName (${oldPrefs.all.size} keys)"
)
return oldPrefs.all.size return oldPrefs.all.size
} }
@@ -150,7 +143,7 @@ class MigrationManager(private val context: Context) {
} }
} }
Log.d(TAG, "✅ Migrated ${keysToMigrate.size} keys in $prefFileName") AppLogger.d(TAG) { "Migrated ${keysToMigrate.size} keys in $prefFileName" }
count += keysToMigrate.size count += keysToMigrate.size
} }
} }
@@ -166,6 +159,6 @@ class MigrationManager(private val context: Context) {
/** Reset migration state (for testing purposes) */ /** Reset migration state (for testing purposes) */
fun resetMigrationState() { fun resetMigrationState() {
migrationPrefs.edit { putBoolean(MIGRATION_COMPLETED_KEY, false) } migrationPrefs.edit { putBoolean(MIGRATION_COMPLETED_KEY, false) }
Log.d(TAG, "Migration state reset") AppLogger.d(TAG) { "Migration state reset" }
} }
} }

73
android/app/src/main/java/com/atridad/ascently/utils/ZipExportImportUtils.kt
View File

@@ -52,7 +52,8 @@ object ZipExportImportUtils {
zipOut.closeEntry() zipOut.closeEntry()
// Add JSON data file // Add JSON data file
val json = Json { val json =
Json {
prettyPrint = true prettyPrint = true
ignoreUnknownKeys = true ignoreUnknownKeys = true
} }
@@ -78,24 +79,21 @@ object ZipExportImportUtils {
zipOut.closeEntry() zipOut.closeEntry()
successfulImages++ successfulImages++
} else { } else {
android.util.Log.w( AppLogger.w("ZipExportImportUtils") {
"ZipExportImportUtils",
"Image file not found or empty: $imagePath" "Image file not found or empty: $imagePath"
) }
} }
} catch (e: Exception) { } catch (e: Exception) {
android.util.Log.e( AppLogger.e("ZipExportImportUtils", e) {
"ZipExportImportUtils",
"Failed to add image $imagePath: ${e.message}" "Failed to add image $imagePath: ${e.message}"
) }
} }
} }
// Log export summary // Log export summary
android.util.Log.i( AppLogger.i("ZipExportImportUtils") {
"ZipExportImportUtils",
"Export completed: ${successfulImages}/${referencedImagePaths.size} images included" "Export completed: ${successfulImages}/${referencedImagePaths.size} images included"
) }
} }
// Validate the created ZIP file // Validate the created ZIP file
@@ -131,7 +129,8 @@ object ZipExportImportUtils {
zipOut.closeEntry() zipOut.closeEntry()
// Add JSON data file // Add JSON data file
val json = Json { val json =
Json {
prettyPrint = true prettyPrint = true
ignoreUnknownKeys = true ignoreUnknownKeys = true
} }
@@ -158,17 +157,15 @@ object ZipExportImportUtils {
successfulImages++ successfulImages++
} }
} catch (e: Exception) { } catch (e: Exception) {
android.util.Log.e( AppLogger.e("ZipExportImportUtils", e) {
"ZipExportImportUtils",
"Failed to add image $imagePath: ${e.message}" "Failed to add image $imagePath: ${e.message}"
) }
} }
} }
android.util.Log.i( AppLogger.i("ZipExportImportUtils") {
"ZipExportImportUtils",
"Export to URI completed: ${successfulImages}/${referencedImagePaths.size} images included" "Export to URI completed: ${successfulImages}/${referencedImagePaths.size} images included"
) }
} }
} }
?: throw IOException("Could not open output stream") ?: throw IOException("Could not open output stream")
@@ -217,16 +214,17 @@ object ZipExportImportUtils {
// Read metadata for validation // Read metadata for validation
val metadataContent = zipIn.readBytes().toString(Charsets.UTF_8) val metadataContent = zipIn.readBytes().toString(Charsets.UTF_8)
foundRequiredFiles.add("metadata") foundRequiredFiles.add("metadata")
android.util.Log.i( AppLogger.i("ZipExportImportUtils") {
"ZipExportImportUtils",
"Found metadata: ${metadataContent.lines().take(3).joinToString()}" "Found metadata: ${metadataContent.lines().take(3).joinToString()}"
)
} }
}
entry.name == DATA_JSON_FILENAME -> { entry.name == DATA_JSON_FILENAME -> {
// Read JSON data // Read JSON data
jsonContent = zipIn.readBytes().toString(Charsets.UTF_8) jsonContent = zipIn.readBytes().toString(Charsets.UTF_8)
foundRequiredFiles.add("data") foundRequiredFiles.add("data")
} }
entry.name.startsWith("$IMAGES_DIR_NAME/") && !entry.isDirectory -> { entry.name.startsWith("$IMAGES_DIR_NAME/") && !entry.isDirectory -> {
// Extract image file // Extract image file
val originalFilename = entry.name.substringAfter("$IMAGES_DIR_NAME/") val originalFilename = entry.name.substringAfter("$IMAGES_DIR_NAME/")
@@ -248,37 +246,33 @@ object ZipExportImportUtils {
val newPath = ImageUtils.importImageFile(context, tempFile) val newPath = ImageUtils.importImageFile(context, tempFile)
if (newPath != null) { if (newPath != null) {
importedImagePaths[originalFilename] = newPath importedImagePaths[originalFilename] = newPath
android.util.Log.d( AppLogger.d("ZipExportImportUtils") {
"ZipExportImportUtils",
"Successfully imported image: $originalFilename -> $newPath" "Successfully imported image: $originalFilename -> $newPath"
)
} else {
android.util.Log.w(
"ZipExportImportUtils",
"Failed to import image: $originalFilename"
)
} }
} else { } else {
android.util.Log.w( AppLogger.w("ZipExportImportUtils") {
"ZipExportImportUtils", "Failed to import image: $originalFilename"
}
}
} else {
AppLogger.w("ZipExportImportUtils") {
"Extracted image is empty: $originalFilename" "Extracted image is empty: $originalFilename"
) }
} }
// Clean up temp file // Clean up temp file
tempFile.delete() tempFile.delete()
} catch (e: Exception) { } catch (e: Exception) {
android.util.Log.e( AppLogger.e("ZipExportImportUtils", e) {
"ZipExportImportUtils",
"Failed to process image $originalFilename: ${e.message}" "Failed to process image $originalFilename: ${e.message}"
)
} }
} }
}
else -> { else -> {
android.util.Log.d( AppLogger.d("ZipExportImportUtils") {
"ZipExportImportUtils",
"Skipping ZIP entry: ${entry.name}" "Skipping ZIP entry: ${entry.name}"
) }
} }
} }
@@ -296,10 +290,9 @@ object ZipExportImportUtils {
throw IOException("Invalid ZIP file: data.json is empty") throw IOException("Invalid ZIP file: data.json is empty")
} }
android.util.Log.i( AppLogger.i("ZipExportImportUtils") {
"ZipExportImportUtils",
"Import extraction completed: ${importedImagePaths.size} images processed" "Import extraction completed: ${importedImagePaths.size} images processed"
) }
return ImportResult(jsonContent, importedImagePaths) return ImportResult(jsonContent, importedImagePaths)
} catch (e: Exception) { } catch (e: Exception) {

2
ios/Ascently.xcodeproj/LiveActivityManager.swift
View File

@@ -25,7 +25,7 @@ final class LiveActivityManager {
pushType: nil pushType: nil
) )
} catch { } catch {
print("Failed to start live activity: \(error)") AppLogger.error("Failed to start live activity: \(error)", tag: "LegacyLiveActivityManager")
} }
} }

BIN
ios/Ascently.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

14
ios/Ascently/ContentView.swift
View File

@@ -91,11 +91,12 @@ struct ContentView: View {
object: nil, object: nil,
queue: .main queue: .main
) { _ in ) { _ in
print("App will enter foreground - preparing Live Activity check") Task { @MainActor in
Task { AppLogger.info(
"App will enter foreground - preparing Live Activity check", tag: "Lifecycle")
// Small delay to ensure app is fully active // Small delay to ensure app is fully active
try? await Task.sleep(nanoseconds: 800_000_000) // 0.8 seconds try? await Task.sleep(nanoseconds: 800_000_000) // 0.8 seconds
await dataManager.onAppBecomeActive() dataManager.onAppBecomeActive()
// Re-verify health integration when returning from background // Re-verify health integration when returning from background
await dataManager.healthKitService.verifyAndRestoreIntegration() await dataManager.healthKitService.verifyAndRestoreIntegration()
} }
@@ -107,10 +108,11 @@ struct ContentView: View {
object: nil, object: nil,
queue: .main queue: .main
) { _ in ) { _ in
print("App did become active - checking Live Activity status") Task { @MainActor in
Task { AppLogger.info(
"App did become active - checking Live Activity status", tag: "Lifecycle")
try? await Task.sleep(nanoseconds: 300_000_000) // 0.3 seconds try? await Task.sleep(nanoseconds: 300_000_000) // 0.3 seconds
await dataManager.onAppBecomeActive() dataManager.onAppBecomeActive()
await dataManager.healthKitService.verifyAndRestoreIntegration() await dataManager.healthKitService.verifyAndRestoreIntegration()
} }
} }

39
ios/Ascently/Services/HealthKitService.swift
View File

@@ -38,7 +38,7 @@ class HealthKitService: ObservableObject {
{ {
currentWorkoutStartDate = startDate currentWorkoutStartDate = startDate
currentWorkoutSessionId = sessionId currentWorkoutSessionId = sessionId
print("HealthKit: Restored active workout from \(startDate)") AppLogger.info("HealthKit: Restored active workout from \(startDate)", tag: "HealthKit")
} }
} }
@@ -56,31 +56,34 @@ class HealthKitService: ObservableObject {
guard isEnabled else { return } guard isEnabled else { return }
guard HKHealthStore.isHealthDataAvailable() else { guard HKHealthStore.isHealthDataAvailable() else {
print("HealthKit: Device does not support HealthKit") AppLogger.warning("HealthKit: Device does not support HealthKit", tag: "HealthKit")
return return
} }
checkAuthorization() checkAuthorization()
if !isAuthorized { if !isAuthorized {
print( AppLogger.warning(
"HealthKit: Integration was enabled but authorization lost, attempting to restore..." "HealthKit: Integration was enabled but authorization lost, attempting to restore...",
) tag: "HealthKit")
do { do {
try await requestAuthorization() try await requestAuthorization()
print("HealthKit: Authorization restored successfully") AppLogger.info("HealthKit: Authorization restored successfully", tag: "HealthKit")
} catch { } catch {
print("HealthKit: Failed to restore authorization: \(error.localizedDescription)") AppLogger.error(
"HealthKit: Failed to restore authorization: \(error.localizedDescription)",
tag: "HealthKit")
} }
} else { } else {
print("HealthKit: Integration verified - authorization is valid") AppLogger.info(
"HealthKit: Integration verified - authorization is valid", tag: "HealthKit")
} }
if hasActiveWorkout() { if hasActiveWorkout() {
print( AppLogger.info(
"HealthKit: Active workout restored - started at \(currentWorkoutStartDate!)" "HealthKit: Active workout restored - started at \(currentWorkoutStartDate!)",
) tag: "HealthKit")
} }
} }
@@ -130,7 +133,7 @@ class HealthKitService: ObservableObject {
currentWorkoutStartDate = startDate currentWorkoutStartDate = startDate
currentWorkoutSessionId = sessionId currentWorkoutSessionId = sessionId
persistActiveWorkout() persistActiveWorkout()
print("HealthKit: Started workout for session \(sessionId)") AppLogger.info("HealthKit: Started workout for session \(sessionId)", tag: "HealthKit")
} }
func endWorkout(endDate: Date) async throws { func endWorkout(endDate: Date) async throws {
@@ -178,15 +181,17 @@ class HealthKitService: ObservableObject {
try await builder.endCollection(at: endDate) try await builder.endCollection(at: endDate)
let workout = try await builder.finishWorkout() let workout = try await builder.finishWorkout()
print( AppLogger.info(
"HealthKit: Workout saved successfully with id: \(workout?.uuid.uuidString ?? "unknown")" "HealthKit: Workout saved successfully with id: \(workout?.uuid.uuidString ?? "unknown")",
) tag: "HealthKit")
currentWorkoutStartDate = nil currentWorkoutStartDate = nil
currentWorkoutSessionId = nil currentWorkoutSessionId = nil
persistActiveWorkout() persistActiveWorkout()
} catch { } catch {
print("HealthKit: Failed to save workout: \(error.localizedDescription)") AppLogger.error(
"HealthKit: Failed to save workout: \(error.localizedDescription)", tag: "HealthKit"
)
currentWorkoutStartDate = nil currentWorkoutStartDate = nil
currentWorkoutSessionId = nil currentWorkoutSessionId = nil
persistActiveWorkout() persistActiveWorkout()
@@ -199,7 +204,7 @@ class HealthKitService: ObservableObject {
currentWorkoutStartDate = nil currentWorkoutStartDate = nil
currentWorkoutSessionId = nil currentWorkoutSessionId = nil
persistActiveWorkout() persistActiveWorkout()
print("HealthKit: Workout cancelled") AppLogger.info("HealthKit: Workout cancelled", tag: "HealthKit")
} }
func hasActiveWorkout() -> Bool { func hasActiveWorkout() -> Bool {

91
ios/Ascently/Services/SyncService.swift
View File

@@ -12,10 +12,27 @@ class SyncService: ObservableObject {
@Published var isOfflineMode = false @Published var isOfflineMode = false
private let userDefaults = UserDefaults.standard private let userDefaults = UserDefaults.standard
private let logTag = "SyncService"
private var syncTask: Task<Void, Never>? private var syncTask: Task<Void, Never>?
private var pendingChanges = false private var pendingChanges = false
private let syncDebounceDelay: TimeInterval = 2.0 private let syncDebounceDelay: TimeInterval = 2.0
private func logDebug(_ message: @autoclosure () -> String) {
AppLogger.debug(message(), tag: logTag)
}
private func logInfo(_ message: @autoclosure () -> String) {
AppLogger.info(message(), tag: logTag)
}
private func logWarning(_ message: @autoclosure () -> String) {
AppLogger.warning(message(), tag: logTag)
}
private func logError(_ message: @autoclosure () -> String) {
AppLogger.error(message(), tag: logTag)
}
private enum Keys { private enum Keys {
static let serverURL = "sync_server_url" static let serverURL = "sync_server_url"
static let authToken = "sync_auth_token" static let authToken = "sync_auth_token"
@@ -201,7 +218,7 @@ class SyncService: ObservableObject {
return false return false
} }
print( logInfo(
"iOS DELTA SYNC: Sending gyms=\(modifiedGyms.count), problems=\(modifiedProblems.count), sessions=\(modifiedSessions.count), attempts=\(modifiedAttempts.count), deletions=\(modifiedDeletions.count)" "iOS DELTA SYNC: Sending gyms=\(modifiedGyms.count), problems=\(modifiedProblems.count), sessions=\(modifiedSessions.count), attempts=\(modifiedAttempts.count), deletions=\(modifiedDeletions.count)"
) )
@@ -244,7 +261,7 @@ class SyncService: ObservableObject {
let decoder = JSONDecoder() let decoder = JSONDecoder()
let deltaResponse = try decoder.decode(DeltaSyncResponse.self, from: data) let deltaResponse = try decoder.decode(DeltaSyncResponse.self, from: data)
print( logInfo(
"iOS DELTA SYNC: Received gyms=\(deltaResponse.gyms.count), problems=\(deltaResponse.problems.count), sessions=\(deltaResponse.sessions.count), attempts=\(deltaResponse.attempts.count), deletions=\(deltaResponse.deletedItems.count)" "iOS DELTA SYNC: Received gyms=\(deltaResponse.gyms.count), problems=\(deltaResponse.problems.count), sessions=\(deltaResponse.sessions.count), attempts=\(deltaResponse.attempts.count), deletions=\(deltaResponse.deletedItems.count)"
) )
@@ -270,7 +287,7 @@ class SyncService: ObservableObject {
let allDeletions = dataManager.getDeletedItems() + response.deletedItems let allDeletions = dataManager.getDeletedItems() + response.deletedItems
let uniqueDeletions = Array(Set(allDeletions)) let uniqueDeletions = Array(Set(allDeletions))
print( logInfo(
"iOS DELTA SYNC: Applying \(uniqueDeletions.count) deletion records before merging data" "iOS DELTA SYNC: Applying \(uniqueDeletions.count) deletion records before merging data"
) )
applyDeletionsToDataManager(deletions: uniqueDeletions, dataManager: dataManager) applyDeletionsToDataManager(deletions: uniqueDeletions, dataManager: dataManager)
@@ -298,10 +315,10 @@ class SyncService: ObservableObject {
_ = try imageManager.saveImportedImage(imageData, filename: consistentFilename) _ = try imageManager.saveImportedImage(imageData, filename: consistentFilename)
imagePathMapping[serverFilename] = consistentFilename imagePathMapping[serverFilename] = consistentFilename
} catch SyncError.imageNotFound { } catch SyncError.imageNotFound {
print("Image not found on server: \(serverFilename)") logInfo("Image not found on server: \(serverFilename)")
continue continue
} catch { } catch {
print("Failed to download image \(serverFilename): \(error)") logInfo("Failed to download image \(serverFilename): \(error)")
continue continue
} }
} }
@@ -436,7 +453,7 @@ class SyncService: ObservableObject {
) async throws { ) async throws {
guard !modifiedProblems.isEmpty else { return } guard !modifiedProblems.isEmpty else { return }
print("iOS DELTA SYNC: Syncing images for \(modifiedProblems.count) modified problems") logInfo("iOS DELTA SYNC: Syncing images for \(modifiedProblems.count) modified problems")
for backupProblem in modifiedProblems { for backupProblem in modifiedProblems {
guard guard
@@ -465,9 +482,9 @@ class SyncService: ObservableObject {
} }
try await uploadImage(filename: consistentFilename, imageData: imageData) try await uploadImage(filename: consistentFilename, imageData: imageData)
print("Uploaded modified problem image: \(consistentFilename)") logInfo("Uploaded modified problem image: \(consistentFilename)")
} catch { } catch {
print("Failed to upload image \(consistentFilename): \(error)") logInfo("Failed to upload image \(consistentFilename): \(error)")
} }
} }
} }
@@ -549,7 +566,7 @@ class SyncService: ObservableObject {
func syncWithServer(dataManager: ClimbingDataManager) async throws { func syncWithServer(dataManager: ClimbingDataManager) async throws {
if isOfflineMode { if isOfflineMode {
print("Sync skipped: Offline mode is enabled.") logInfo("Sync skipped: Offline mode is enabled.")
return return
} }
@@ -586,7 +603,7 @@ class SyncService: ObservableObject {
// If both client and server have been synced before, use delta sync // If both client and server have been synced before, use delta sync
if hasLocalData && hasServerData && lastSyncTime != nil { if hasLocalData && hasServerData && lastSyncTime != nil {
print("iOS SYNC: Using delta sync for incremental updates") logInfo("iOS SYNC: Using delta sync for incremental updates")
try await performDeltaSync(dataManager: dataManager) try await performDeltaSync(dataManager: dataManager)
// Update last sync time // Update last sync time
@@ -597,32 +614,32 @@ class SyncService: ObservableObject {
if !hasLocalData && hasServerData { if !hasLocalData && hasServerData {
// Case 1: No local data - do full restore from server // Case 1: No local data - do full restore from server
print("iOS SYNC: Case 1 - No local data, performing full restore from server") logInfo("iOS SYNC: Case 1 - No local data, performing full restore from server")
print("Syncing images from server first...") logInfo("Syncing images from server first...")
let imagePathMapping = try await syncImagesFromServer( let imagePathMapping = try await syncImagesFromServer(
backup: serverBackup, dataManager: dataManager) backup: serverBackup, dataManager: dataManager)
print("Importing data after images...") logInfo("Importing data after images...")
try importBackupToDataManager( try importBackupToDataManager(
serverBackup, dataManager: dataManager, imagePathMapping: imagePathMapping) serverBackup, dataManager: dataManager, imagePathMapping: imagePathMapping)
print("Full restore completed") logInfo("Full restore completed")
} else if hasLocalData && !hasServerData { } else if hasLocalData && !hasServerData {
// Case 2: No server data - upload local data to server // Case 2: No server data - upload local data to server
print("iOS SYNC: Case 2 - No server data, uploading local data to server") logInfo("iOS SYNC: Case 2 - No server data, uploading local data to server")
let currentBackup = createBackupFromDataManager(dataManager) let currentBackup = createBackupFromDataManager(dataManager)
_ = try await uploadData(currentBackup) _ = try await uploadData(currentBackup)
print("Uploading local images to server...") logInfo("Uploading local images to server...")
try await syncImagesToServer(dataManager: dataManager) try await syncImagesToServer(dataManager: dataManager)
print("Initial upload completed") logInfo("Initial upload completed")
} else if hasLocalData && hasServerData { } else if hasLocalData && hasServerData {
// Case 3: Both have data - use safe merge strategy // Case 3: Both have data - use safe merge strategy
print("iOS SYNC: Case 3 - Merging local and server data safely") logInfo("iOS SYNC: Case 3 - Merging local and server data safely")
try await mergeDataSafely( try await mergeDataSafely(
localBackup: localBackup, localBackup: localBackup,
serverBackup: serverBackup, serverBackup: serverBackup,
dataManager: dataManager) dataManager: dataManager)
print("Safe merge completed") logInfo("Safe merge completed")
} else { } else {
print("No data to sync") logInfo("No data to sync")
} }
// Update last sync time // Update last sync time
@@ -640,7 +657,7 @@ class SyncService: ObservableObject {
if let date = formatter.date(from: timestamp) { if let date = formatter.date(from: timestamp) {
return Int64(date.timeIntervalSince1970 * 1000) return Int64(date.timeIntervalSince1970 * 1000)
} }
print("Failed to parse timestamp: \(timestamp), using 0") logInfo("Failed to parse timestamp: \(timestamp), using 0")
return 0 return 0
} }
@@ -666,12 +683,12 @@ class SyncService: ObservableObject {
imageData, filename: consistentFilename) imageData, filename: consistentFilename)
imagePathMapping[serverFilename] = consistentFilename imagePathMapping[serverFilename] = consistentFilename
print("Downloaded and mapped image: \(serverFilename) -> \(consistentFilename)") logInfo("Downloaded and mapped image: \(serverFilename) -> \(consistentFilename)")
} catch SyncError.imageNotFound { } catch SyncError.imageNotFound {
print("Image not found on server: \(serverFilename)") logInfo("Image not found on server: \(serverFilename)")
continue continue
} catch { } catch {
print("Failed to download image \(serverFilename): \(error)") logInfo("Failed to download image \(serverFilename): \(error)")
continue continue
} }
} }
@@ -704,18 +721,18 @@ class SyncService: ObservableObject {
).path ).path
do { do {
try FileManager.default.moveItem(atPath: fullPath, toPath: newPath) try FileManager.default.moveItem(atPath: fullPath, toPath: newPath)
print("Renamed local image: \(filename) -> \(consistentFilename)") logInfo("Renamed local image: \(filename) -> \(consistentFilename)")
// Update problem's image path in memory for consistency // Update problem's image path in memory for consistency
} catch { } catch {
print("Failed to rename local image, using original: \(error)") logInfo("Failed to rename local image, using original: \(error)")
} }
} }
try await uploadImage(filename: consistentFilename, imageData: imageData) try await uploadImage(filename: consistentFilename, imageData: imageData)
print("Successfully uploaded image: \(consistentFilename)") logInfo("Successfully uploaded image: \(consistentFilename)")
} catch { } catch {
print("Failed to upload image \(consistentFilename): \(error)") logInfo("Failed to upload image \(consistentFilename): \(error)")
// Continue with other images even if one fails // Continue with other images even if one fails
} }
} }
@@ -733,7 +750,7 @@ class SyncService: ObservableObject {
!activeSessionIds.contains($0.sessionId) !activeSessionIds.contains($0.sessionId)
} }
print( logInfo(
"iOS SYNC: Excluding \(dataManager.sessions.count - completedSessions.count) active sessions and \(dataManager.attempts.count - completedAttempts.count) active session attempts from sync" "iOS SYNC: Excluding \(dataManager.sessions.count - completedSessions.count) active sessions and \(dataManager.attempts.count - completedAttempts.count) active session attempts from sync"
) )
@@ -808,26 +825,26 @@ class SyncService: ObservableObject {
let allDeletions = localDeletions + serverBackup.deletedItems let allDeletions = localDeletions + serverBackup.deletedItems
let uniqueDeletions = Array(Set(allDeletions)) let uniqueDeletions = Array(Set(allDeletions))
print("Merging gyms...") logInfo("Merging gyms...")
let mergedGyms = mergeGyms( let mergedGyms = mergeGyms(
local: dataManager.gyms, local: dataManager.gyms,
server: serverBackup.gyms, server: serverBackup.gyms,
deletedItems: uniqueDeletions) deletedItems: uniqueDeletions)
print("Merging problems...") logInfo("Merging problems...")
let mergedProblems = try mergeProblems( let mergedProblems = try mergeProblems(
local: dataManager.problems, local: dataManager.problems,
server: serverBackup.problems, server: serverBackup.problems,
imagePathMapping: imagePathMapping, imagePathMapping: imagePathMapping,
deletedItems: uniqueDeletions) deletedItems: uniqueDeletions)
print("Merging sessions...") logInfo("Merging sessions...")
let mergedSessions = try mergeSessions( let mergedSessions = try mergeSessions(
local: dataManager.sessions, local: dataManager.sessions,
server: serverBackup.sessions, server: serverBackup.sessions,
deletedItems: uniqueDeletions) deletedItems: uniqueDeletions)
print("Merging attempts...") logInfo("Merging attempts...")
let mergedAttempts = try mergeAttempts( let mergedAttempts = try mergeAttempts(
local: dataManager.attempts, local: dataManager.attempts,
server: serverBackup.attempts, server: serverBackup.attempts,
@@ -887,7 +904,7 @@ class SyncService: ObservableObject {
&& !allDeletedAttemptIds.contains($0.id.uuidString) && !allDeletedAttemptIds.contains($0.id.uuidString)
} }
print( logInfo(
"iOS IMPORT: Preserving \(activeSessions.count) active sessions and \(activeAttempts.count) active attempts during import" "iOS IMPORT: Preserving \(activeSessions.count) active sessions and \(activeAttempts.count) active attempts during import"
) )
@@ -977,7 +994,7 @@ class SyncService: ObservableObject {
// Restore active sessions and their attempts after import // Restore active sessions and their attempts after import
for session in activeSessions { for session in activeSessions {
print("iOS IMPORT: Restoring active session: \(session.id)") logInfo("iOS IMPORT: Restoring active session: \(session.id)")
dataManager.sessions.append(session) dataManager.sessions.append(session)
if session.id == dataManager.activeSession?.id { if session.id == dataManager.activeSession?.id {
dataManager.activeSession = session dataManager.activeSession = session
@@ -997,12 +1014,12 @@ class SyncService: ObservableObject {
dataManager.clearDeletedItems() dataManager.clearDeletedItems()
if let data = try? JSONEncoder().encode(backup.deletedItems) { if let data = try? JSONEncoder().encode(backup.deletedItems) {
UserDefaults.standard.set(data, forKey: "ascently_deleted_items") UserDefaults.standard.set(data, forKey: "ascently_deleted_items")
print("iOS IMPORT: Imported \(backup.deletedItems.count) deletion records") logInfo("iOS IMPORT: Imported \(backup.deletedItems.count) deletion records")
} }
// Update local data state to match imported data timestamp // Update local data state to match imported data timestamp
DataStateManager.shared.setLastModified(backup.exportedAt) DataStateManager.shared.setLastModified(backup.exportedAt)
print("Data state synchronized to imported timestamp: \(backup.exportedAt)") logInfo("Data state synchronized to imported timestamp: \(backup.exportedAt)")
} catch { } catch {
throw SyncError.importFailed(error) throw SyncError.importFailed(error)

46
ios/Ascently/Utils/AppLogger.swift Normal file
View File

@@ -0,0 +1,46 @@
import Foundation
/// Centralized logging utility for the iOS app.
///
/// All log output is automatically compiled out in non-debug builds to avoid leaking
/// sensitive information. Use this instead of calling `print` directly.
enum AppLogger {
enum LogLevel: String {
case debug = "DEBUG"
case info = "INFO"
case warning = "WARN"
case error = "ERROR"
}
static func debug(_ message: @autoclosure () -> String, tag: String = #fileID) {
log(level: .debug, tag: tag, message: message())
}
static func info(_ message: @autoclosure () -> String, tag: String = #fileID) {
log(level: .info, tag: tag, message: message())
}
static func warning(_ message: @autoclosure () -> String, tag: String = #fileID) {
log(level: .warning, tag: tag, message: message())
}
static func error(_ message: @autoclosure () -> String, tag: String = #fileID) {
log(level: .error, tag: tag, message: message())
}
static func log(level: LogLevel, tag: String, message: @autoclosure () -> String) {
#if DEBUG
let lastPath = (tag as NSString).lastPathComponent
let resolvedTag = lastPath.isEmpty ? tag : lastPath
Swift.print("[\(level.rawValue)][\(resolvedTag)] \(message())")
#endif
}
}
enum LogTag {
static let climbingData = "ClimbingData"
static let dataManagement = "DataManagementSection"
static let exportData = "ExportDataView"
static let syncSection = "SyncSection"
}

22
ios/Ascently/Utils/DataStateManager.swift
View File

@@ -18,14 +18,17 @@ class DataStateManager {
private init() { private init() {
// Initialize with current timestamp if this is the first time // Initialize with current timestamp if this is the first time
if !isInitialized() { if !isInitialized() {
print("DataStateManager: First time initialization") AppLogger.info("DataStateManager: First time initialization", tag: "DataState")
// Set initial timestamp to a very old date so server data will be considered newer // Set initial timestamp to a very old date so server data will be considered newer
let epochTime = "1970-01-01T00:00:00.000Z" let epochTime = "1970-01-01T00:00:00.000Z"
userDefaults.set(epochTime, forKey: Keys.lastModified) userDefaults.set(epochTime, forKey: Keys.lastModified)
markAsInitialized() markAsInitialized()
print("DataStateManager initialized with epoch timestamp: \(epochTime)") AppLogger.info(
"DataStateManager initialized with epoch timestamp: \(epochTime)", tag: "DataState")
} else { } else {
print("DataStateManager: Already initialized, current timestamp: \(getLastModified())") AppLogger.info(
"DataStateManager: Already initialized, current timestamp: \(getLastModified())",
tag: "DataState")
} }
} }
@@ -34,29 +37,32 @@ class DataStateManager {
func updateDataState() { func updateDataState() {
let now = ISO8601DateFormatter().string(from: Date()) let now = ISO8601DateFormatter().string(from: Date())
userDefaults.set(now, forKey: Keys.lastModified) userDefaults.set(now, forKey: Keys.lastModified)
print("iOS Data state updated to: \(now)") AppLogger.info("iOS Data state updated to: \(now)", tag: "DataState")
} }
func getLastModified() -> String { func getLastModified() -> String {
if let storedTimestamp = userDefaults.string(forKey: Keys.lastModified) { if let storedTimestamp = userDefaults.string(forKey: Keys.lastModified) {
print("iOS DataStateManager returning stored timestamp: \(storedTimestamp)") AppLogger.debug(
"iOS DataStateManager returning stored timestamp: \(storedTimestamp)",
tag: "DataState")
return storedTimestamp return storedTimestamp
} }
let epochTime = "1970-01-01T00:00:00.000Z" let epochTime = "1970-01-01T00:00:00.000Z"
print("No data state timestamp found - returning epoch time: \(epochTime)") AppLogger.warning(
"No data state timestamp found - returning epoch time: \(epochTime)", tag: "DataState")
return epochTime return epochTime
} }
func setLastModified(_ timestamp: String) { func setLastModified(_ timestamp: String) {
userDefaults.set(timestamp, forKey: Keys.lastModified) userDefaults.set(timestamp, forKey: Keys.lastModified)
print("Data state set to: \(timestamp)") AppLogger.info("Data state set to: \(timestamp)", tag: "DataState")
} }
func reset() { func reset() {
userDefaults.removeObject(forKey: Keys.lastModified) userDefaults.removeObject(forKey: Keys.lastModified)
userDefaults.removeObject(forKey: Keys.initialized) userDefaults.removeObject(forKey: Keys.initialized)
print("Data state reset") AppLogger.info("Data state reset", tag: "DataState")
} }
private func isInitialized() -> Bool { private func isInitialized() -> Bool {

164
ios/Ascently/Utils/ImageManager.swift
View File

@@ -5,6 +5,7 @@ import UIKit
class ImageManager { class ImageManager {
static let shared = ImageManager() static let shared = ImageManager()
private let logTag = "ImageManager"
private let thumbnailCache = NSCache<NSString, UIImage>() private let thumbnailCache = NSCache<NSString, UIImage>()
private let fileManager = FileManager.default private let fileManager = FileManager.default
@@ -30,7 +31,7 @@ class ImageManager {
// Final integrity check // Final integrity check
if !validateStorageIntegrity() { if !validateStorageIntegrity() {
print("CRITICAL: Storage integrity compromised - attempting emergency recovery") logError("CRITICAL: Storage integrity compromised - attempting emergency recovery")
emergencyImageRestore() emergencyImageRestore()
} }
@@ -83,7 +84,7 @@ class ImageManager {
return return
} }
print("🔄 Migrating images from OpenClimb to Ascently directory...") logInfo("🔄 Migrating images from OpenClimb to Ascently directory...")
do { do {
// Create parent directory if needed // Create parent directory if needed
@@ -94,16 +95,16 @@ class ImageManager {
// Move the entire directory // Move the entire directory
try fileManager.moveItem(at: legacyDir, to: appSupportDirectory) try fileManager.moveItem(at: legacyDir, to: appSupportDirectory)
print("Successfully migrated image directory from OpenClimb to Ascently") logInfo("Successfully migrated image directory from OpenClimb to Ascently")
} catch { } catch {
print("❌ Failed to migrate image directory: \(error)") logError("Failed to migrate image directory: \(error)")
// If move fails, try to copy instead // If move fails, try to copy instead
do { do {
try fileManager.copyItem(at: legacyDir, to: appSupportDirectory) try fileManager.copyItem(at: legacyDir, to: appSupportDirectory)
print("Successfully copied image directory from OpenClimb to Ascently") logInfo("Successfully copied image directory from OpenClimb to Ascently")
// Don't remove the old directory in case of issues // Don't remove the old directory in case of issues
} catch { } catch {
print("❌ Failed to copy image directory: \(error)") logError("Failed to copy image directory: \(error)")
} }
} }
} }
@@ -122,9 +123,9 @@ class ImageManager {
attributes: [ attributes: [
.protectionKey: FileProtectionType.completeUntilFirstUserAuthentication .protectionKey: FileProtectionType.completeUntilFirstUserAuthentication
]) ])
print("Created directory: \(directory.path)") logInfo("Created directory: \(directory.path)")
} catch { } catch {
print("ERROR: Failed to create directory \(directory.path): \(error)") logError("ERROR: Failed to create directory \(directory.path): \(error)")
} }
} }
} }
@@ -141,9 +142,9 @@ class ImageManager {
var backupURL = backupDirectory var backupURL = backupDirectory
try imagesURL.setResourceValues(resourceValues) try imagesURL.setResourceValues(resourceValues)
try backupURL.setResourceValues(resourceValues) try backupURL.setResourceValues(resourceValues)
print("Excluded image directories from iCloud backup") logInfo("Excluded image directories from iCloud backup")
} catch { } catch {
print("WARNING: Failed to exclude from iCloud backup: \(error)") logWarning("WARNING: Failed to exclude from iCloud backup: \(error)")
} }
} }
@@ -167,11 +168,11 @@ class ImageManager {
} }
private func performRobustMigration() { private func performRobustMigration() {
print("Starting robust image migration system...") logInfo("Starting robust image migration system...")
// Check for interrupted migration // Check for interrupted migration
if let incompleteState = loadMigrationState() { if let incompleteState = loadMigrationState() {
print("Detected interrupted migration, resuming...") logInfo("Detected interrupted migration, resuming...")
resumeMigration(from: incompleteState) resumeMigration(from: incompleteState)
} else { } else {
// Start fresh migration // Start fresh migration
@@ -188,7 +189,7 @@ class ImageManager {
private func startNewMigration() { private func startNewMigration() {
// First check for images in previous Application Support directories // First check for images in previous Application Support directories
if let previousAppSupportImages = findPreviousAppSupportImages() { if let previousAppSupportImages = findPreviousAppSupportImages() {
print("Found images in previous Application Support directory") logInfo("Found images in previous Application Support directory")
migratePreviousAppSupportImages(from: previousAppSupportImages) migratePreviousAppSupportImages(from: previousAppSupportImages)
return return
} }
@@ -198,7 +199,7 @@ class ImageManager {
let hasLegacyImportImages = fileManager.fileExists(atPath: legacyImportImagesDirectory.path) let hasLegacyImportImages = fileManager.fileExists(atPath: legacyImportImagesDirectory.path)
guard hasLegacyImages || hasLegacyImportImages else { guard hasLegacyImages || hasLegacyImportImages else {
print("No legacy images to migrate") logInfo("No legacy images to migrate")
return return
} }
@@ -213,7 +214,7 @@ class ImageManager {
let legacyFiles = try fileManager.contentsOfDirectory( let legacyFiles = try fileManager.contentsOfDirectory(
atPath: legacyImagesDirectory.path) atPath: legacyImagesDirectory.path)
allLegacyFiles.append(contentsOf: legacyFiles) allLegacyFiles.append(contentsOf: legacyFiles)
print("Found \(legacyFiles.count) images in OpenClimbImages") logInfo("Found \(legacyFiles.count) images in OpenClimbImages")
} }
// Collect files from Documents/images directory // Collect files from Documents/images directory
@@ -221,10 +222,10 @@ class ImageManager {
let importFiles = try fileManager.contentsOfDirectory( let importFiles = try fileManager.contentsOfDirectory(
atPath: legacyImportImagesDirectory.path) atPath: legacyImportImagesDirectory.path)
allLegacyFiles.append(contentsOf: importFiles) allLegacyFiles.append(contentsOf: importFiles)
print("Found \(importFiles.count) images in Documents/images") logInfo("Found \(importFiles.count) images in Documents/images")
} }
print("Total legacy images to migrate: \(allLegacyFiles.count)") logInfo("Total legacy images to migrate: \(allLegacyFiles.count)")
let initialState = MigrationState( let initialState = MigrationState(
version: MigrationState.currentVersion, version: MigrationState.currentVersion,
@@ -239,24 +240,24 @@ class ImageManager {
performMigrationWithCheckpoints(files: allLegacyFiles, currentState: initialState) performMigrationWithCheckpoints(files: allLegacyFiles, currentState: initialState)
} catch { } catch {
print("ERROR: Failed to start migration: \(error)") logError("ERROR: Failed to start migration: \(error)")
} }
} }
private func resumeMigration(from state: MigrationState) { private func resumeMigration(from state: MigrationState) {
print("Resuming migration from checkpoint...") logInfo("Resuming migration from checkpoint...")
print("Progress: \(state.completedFiles.count)/\(state.totalFiles)") logInfo("Progress: \(state.completedFiles.count)/\(state.totalFiles)")
do { do {
let legacyFiles = try fileManager.contentsOfDirectory( let legacyFiles = try fileManager.contentsOfDirectory(
atPath: legacyImagesDirectory.path) atPath: legacyImagesDirectory.path)
let remainingFiles = legacyFiles.filter { !state.completedFiles.contains($0) } let remainingFiles = legacyFiles.filter { !state.completedFiles.contains($0) }
print("Resuming with \(remainingFiles.count) remaining files") logInfo("Resuming with \(remainingFiles.count) remaining files")
performMigrationWithCheckpoints(files: remainingFiles, currentState: state) performMigrationWithCheckpoints(files: remainingFiles, currentState: state)
} catch { } catch {
print("ERROR: Failed to resume migration: \(error)") logError("ERROR: Failed to resume migration: \(error)")
// Fallback: start fresh // Fallback: start fresh
removeMigrationState() removeMigrationState()
startNewMigration() startNewMigration()
@@ -323,11 +324,11 @@ class ImageManager {
completedFiles.append(fileName) completedFiles.append(fileName)
migratedCount += 1 migratedCount += 1
print("Migrated: \(fileName) (\(migratedCount)/\(currentState.totalFiles))") logInfo("Migrated: \(fileName) (\(migratedCount)/\(currentState.totalFiles))")
} catch { } catch {
failedCount += 1 failedCount += 1
print("ERROR: Failed to migrate \(fileName): \(error)") logError("ERROR: Failed to migrate \(fileName): \(error)")
} }
// Save checkpoint every 5 files or if interrupted // Save checkpoint every 5 files or if interrupted
@@ -341,7 +342,7 @@ class ImageManager {
lastCheckpoint: Date() lastCheckpoint: Date()
) )
saveMigrationState(checkpointState) saveMigrationState(checkpointState)
print("Checkpoint saved: \(completedFiles.count)/\(currentState.totalFiles)") logInfo("Checkpoint saved: \(completedFiles.count)/\(currentState.totalFiles)")
} }
} }
} }
@@ -357,7 +358,7 @@ class ImageManager {
) )
saveMigrationState(finalState) saveMigrationState(finalState)
print("Migration complete: \(migratedCount) migrated, \(failedCount) failed") logInfo("Migration complete: \(migratedCount) migrated, \(failedCount) failed")
// Clean up legacy directory if no failures // Clean up legacy directory if no failures
if failedCount == 0 { if failedCount == 0 {
@@ -366,7 +367,7 @@ class ImageManager {
} }
private func verifyMigrationIntegrity() { private func verifyMigrationIntegrity() {
print("Verifying migration integrity...") logInfo("Verifying migration integrity...")
var allLegacyFiles = Set<String>() var allLegacyFiles = Set<String>()
@@ -384,12 +385,12 @@ class ImageManager {
allLegacyFiles.formUnion(importFiles) allLegacyFiles.formUnion(importFiles)
} }
} catch { } catch {
print("ERROR: Failed to read legacy directories: \(error)") logError("ERROR: Failed to read legacy directories: \(error)")
return return
} }
guard !allLegacyFiles.isEmpty else { guard !allLegacyFiles.isEmpty else {
print("No legacy directories to verify against") logInfo("No legacy directories to verify against")
return return
} }
@@ -400,10 +401,10 @@ class ImageManager {
let missingFiles = allLegacyFiles.subtracting(migratedFiles) let missingFiles = allLegacyFiles.subtracting(migratedFiles)
if missingFiles.isEmpty { if missingFiles.isEmpty {
print("Migration integrity verified - all files present") logInfo("Migration integrity verified - all files present")
cleanupLegacyDirectory() cleanupLegacyDirectory()
} else { } else {
print("WARNING: Missing \(missingFiles.count) files, re-triggering migration") logWarning("WARNING: Missing \(missingFiles.count) files, re-triggering migration")
// Re-trigger migration for missing files // Re-trigger migration for missing files
performMigrationWithCheckpoints( performMigrationWithCheckpoints(
files: Array(missingFiles), files: Array(missingFiles),
@@ -417,16 +418,16 @@ class ImageManager {
)) ))
} }
} catch { } catch {
print("ERROR: Failed to verify migration integrity: \(error)") logError("ERROR: Failed to verify migration integrity: \(error)")
} }
} }
private func cleanupLegacyDirectory() { private func cleanupLegacyDirectory() {
do { do {
try fileManager.removeItem(at: legacyImagesDirectory) try fileManager.removeItem(at: legacyImagesDirectory)
print("Cleaned up legacy directory") logInfo("Cleaned up legacy directory")
} catch { } catch {
print("WARNING: Failed to clean up legacy directory: \(error)") logWarning("WARNING: Failed to clean up legacy directory: \(error)")
} }
} }
@@ -446,16 +447,16 @@ class ImageManager {
let data = try Data(contentsOf: migrationStateURL) let data = try Data(contentsOf: migrationStateURL)
let state = try JSONDecoder().decode(MigrationState.self, from: data) let state = try JSONDecoder().decode(MigrationState.self, from: data)
// Check if state is too old (more than 1 hour) // Check if state is too old
if Date().timeIntervalSince(state.lastCheckpoint) > 3600 { if Date().timeIntervalSince(state.lastCheckpoint) > 3600 {
print("WARNING: Migration state is stale, starting fresh") logWarning("WARNING: Migration state is stale, starting fresh")
removeMigrationState() removeMigrationState()
return nil return nil
} }
return state.isComplete ? nil : state return state.isComplete ? nil : state
} catch { } catch {
print("ERROR: Failed to load migration state: \(error)") logError("ERROR: Failed to load migration state: \(error)")
removeMigrationState() removeMigrationState()
return nil return nil
} }
@@ -466,7 +467,7 @@ class ImageManager {
let data = try JSONEncoder().encode(state) let data = try JSONEncoder().encode(state)
try data.write(to: migrationStateURL) try data.write(to: migrationStateURL)
} catch { } catch {
print("ERROR: Failed to save migration state: \(error)") logError("ERROR: Failed to save migration state: \(error)")
} }
} }
@@ -482,7 +483,7 @@ class ImageManager {
private func cleanupMigrationState() { private func cleanupMigrationState() {
try? fileManager.removeItem(at: migrationStateURL) try? fileManager.removeItem(at: migrationStateURL)
try? fileManager.removeItem(at: migrationLockURL) try? fileManager.removeItem(at: migrationLockURL)
print("Cleaned up migration state files") logInfo("Cleaned up migration state files")
} }
func saveImageData(_ data: Data, withName name: String? = nil) -> String? { func saveImageData(_ data: Data, withName name: String? = nil) -> String? {
@@ -497,10 +498,10 @@ class ImageManager {
// Create backup copy // Create backup copy
try data.write(to: backupPath) try data.write(to: backupPath)
print("Saved image with backup: \(fileName)") logInfo("Saved image with backup: \(fileName)")
return fileName return fileName
} catch { } catch {
print("ERROR: Failed to save image \(fileName): \(error)") logError("ERROR: Failed to save image \(fileName): \(error)")
return nil return nil
} }
} }
@@ -520,7 +521,7 @@ class ImageManager {
if fileManager.fileExists(atPath: backupPath.path), if fileManager.fileExists(atPath: backupPath.path),
let data = try? Data(contentsOf: backupPath) let data = try? Data(contentsOf: backupPath)
{ {
print("Restored image from backup: \(path)") logInfo("Restored image from backup: \(path)")
// Restore to primary location // Restore to primary location
try? data.write(to: URL(fileURLWithPath: primaryPath)) try? data.write(to: URL(fileURLWithPath: primaryPath))
@@ -595,7 +596,7 @@ class ImageManager {
do { do {
try fileManager.removeItem(atPath: primaryPath) try fileManager.removeItem(atPath: primaryPath)
} catch { } catch {
print("ERROR: Failed to delete primary image at \(primaryPath): \(error)") logError("ERROR: Failed to delete primary image at \(primaryPath): \(error)")
success = false success = false
} }
} }
@@ -605,7 +606,7 @@ class ImageManager {
do { do {
try fileManager.removeItem(at: backupPath) try fileManager.removeItem(at: backupPath)
} catch { } catch {
print("ERROR: Failed to delete backup image at \(backupPath.path): \(error)") logError("ERROR: Failed to delete backup image at \(backupPath.path): \(error)")
success = false success = false
} }
} }
@@ -642,7 +643,7 @@ class ImageManager {
} }
func performMaintenance() { func performMaintenance() {
print("Starting image maintenance...") logInfo("Starting image maintenance...")
syncBackups() syncBackups()
validateImageIntegrity() validateImageIntegrity()
@@ -660,11 +661,11 @@ class ImageManager {
let backupPath = backupDirectory.appendingPathComponent(fileName) let backupPath = backupDirectory.appendingPathComponent(fileName)
try? fileManager.copyItem(at: primaryPath, to: backupPath) try? fileManager.copyItem(at: primaryPath, to: backupPath)
print("Created missing backup for: \(fileName)") logInfo("Created missing backup for: \(fileName)")
} }
} }
} catch { } catch {
print("ERROR: Failed to sync backups: \(error)") logError("ERROR: Failed to sync backups: \(error)")
} }
} }
@@ -683,14 +684,14 @@ class ImageManager {
} }
} }
print("Validated \(validFiles) of \(files.count) image files") logInfo("Validated \(validFiles) of \(files.count) image files")
} catch { } catch {
print("ERROR: Failed to validate images: \(error)") logError("ERROR: Failed to validate images: \(error)")
} }
} }
private func cleanupOrphanedFiles() { private func cleanupOrphanedFiles() {
print("Cleanup would require coordination with data manager") logInfo("Cleanup would require coordination with data manager")
} }
func getStorageInfo() -> (primaryCount: Int, backupCount: Int, totalSize: Int64) { func getStorageInfo() -> (primaryCount: Int, backupCount: Int, totalSize: Int64) {
@@ -718,7 +719,7 @@ class ImageManager {
private func logDirectoryInfo() { private func logDirectoryInfo() {
let info = getStorageInfo() let info = getStorageInfo()
let previousDir = findPreviousAppSupportImages() let previousDir = findPreviousAppSupportImages()
print( logInfo(
""" """
Ascently Image Storage: Ascently Image Storage:
- App Support: \(appSupportDirectory.path) - App Support: \(appSupportDirectory.path)
@@ -732,7 +733,7 @@ class ImageManager {
} }
func forceRecoveryMigration() { func forceRecoveryMigration() {
print("FORCE RECOVERY: Starting manual migration recovery...") logInfo("FORCE RECOVERY: Starting manual migration recovery...")
// Remove any stale state // Remove any stale state
removeMigrationState() removeMigrationState()
@@ -741,7 +742,7 @@ class ImageManager {
// Force fresh migration // Force fresh migration
startNewMigration() startNewMigration()
print("FORCE RECOVERY: Migration recovery completed") logInfo("FORCE RECOVERY: Migration recovery completed")
} }
func saveImportedImage(_ imageData: Data, filename: String) throws -> String { func saveImportedImage(_ imageData: Data, filename: String) throws -> String {
@@ -754,12 +755,12 @@ class ImageManager {
// Create backup // Create backup
try? imageData.write(to: backupPath) try? imageData.write(to: backupPath)
print("Imported image: \(filename)") logInfo("Imported image: \(filename)")
return filename return filename
} }
func emergencyImageRestore() { func emergencyImageRestore() {
print("EMERGENCY: Attempting image restoration...") logError("EMERGENCY: Attempting image restoration...")
// Try to restore from backup directory // Try to restore from backup directory
do { do {
@@ -777,14 +778,14 @@ class ImageManager {
} }
} }
print("EMERGENCY: Restored \(restoredCount) images from backup") logError("EMERGENCY: Restored \(restoredCount) images from backup")
} catch { } catch {
print("EMERGENCY: Failed to restore from backup: \(error)") logError("EMERGENCY: Failed to restore from backup: \(error)")
} }
// Try previous Application Support directories first // Try previous Application Support directories first
if let previousAppSupportImages = findPreviousAppSupportImages() { if let previousAppSupportImages = findPreviousAppSupportImages() {
print("EMERGENCY: Found previous Application Support images, migrating...") logError("EMERGENCY: Found previous Application Support images, migrating...")
migratePreviousAppSupportImages(from: previousAppSupportImages) migratePreviousAppSupportImages(from: previousAppSupportImages)
return return
} }
@@ -793,23 +794,21 @@ class ImageManager {
if fileManager.fileExists(atPath: legacyImagesDirectory.path) if fileManager.fileExists(atPath: legacyImagesDirectory.path)
|| fileManager.fileExists(atPath: legacyImportImagesDirectory.path) || fileManager.fileExists(atPath: legacyImportImagesDirectory.path)
{ {
print("EMERGENCY: Attempting legacy migration as fallback...") logError("EMERGENCY: Attempting legacy migration as fallback...")
forceRecoveryMigration() forceRecoveryMigration()
} }
} }
func debugSafeInitialization() -> Bool { func debugSafeInitialization() -> Bool {
print("DEBUG SAFE: Performing debug-safe initialization check...") logDebug("DEBUG SAFE: Performing debug-safe initialization check...")
// Check if we're in a debug environment // Check if we're in a debug environment
#if DEBUG #if DEBUG
print("DEBUG SAFE: Debug environment detected") logDebug("DEBUG SAFE: Debug environment detected")
// Check for interrupted migration more aggressively
if fileManager.fileExists(atPath: migrationLockURL.path) { if fileManager.fileExists(atPath: migrationLockURL.path) {
print("DEBUG SAFE: Found migration lock - likely debug interruption") logDebug("DEBUG SAFE: Found migration lock - likely debug interruption")
// Give extra time for file system to stabilize
Thread.sleep(forTimeInterval: 1.0) Thread.sleep(forTimeInterval: 1.0)
// Try emergency recovery // Try emergency recovery
@@ -829,14 +828,14 @@ class ImageManager {
((try? fileManager.contentsOfDirectory(atPath: backupDirectory.path)) ?? []).count > 0 ((try? fileManager.contentsOfDirectory(atPath: backupDirectory.path)) ?? []).count > 0
if primaryEmpty && backupHasFiles { if primaryEmpty && backupHasFiles {
print("DEBUG SAFE: Primary empty but backup exists - restoring") logDebug("DEBUG SAFE: Primary empty but backup exists - restoring")
emergencyImageRestore() emergencyImageRestore()
return true return true
} }
// Check if primary storage is empty but previous Application Support images exist // Check if primary storage is empty but previous Application Support images exist
if primaryEmpty, let previousAppSupportImages = findPreviousAppSupportImages() { if primaryEmpty, let previousAppSupportImages = findPreviousAppSupportImages() {
print("DEBUG SAFE: Primary empty but found previous Application Support images") logDebug("DEBUG SAFE: Primary empty but found previous Application Support images")
migratePreviousAppSupportImages(from: previousAppSupportImages) migratePreviousAppSupportImages(from: previousAppSupportImages)
return true return true
} }
@@ -852,7 +851,7 @@ class ImageManager {
// Check if we have more backups than primary files (sign of corruption) // Check if we have more backups than primary files (sign of corruption)
if backupFiles.count > primaryFiles.count + 5 { if backupFiles.count > primaryFiles.count + 5 {
print( logInfo(
"WARNING INTEGRITY: Backup count significantly exceeds primary - potential corruption" "WARNING INTEGRITY: Backup count significantly exceeds primary - potential corruption"
) )
return false return false
@@ -860,7 +859,7 @@ class ImageManager {
// Check if primary is completely empty but we have data elsewhere // Check if primary is completely empty but we have data elsewhere
if primaryFiles.isEmpty && !backupFiles.isEmpty { if primaryFiles.isEmpty && !backupFiles.isEmpty {
print("WARNING INTEGRITY: Primary storage empty but backups exist") logWarning("WARNING INTEGRITY: Primary storage empty but backups exist")
return false return false
} }
@@ -874,7 +873,7 @@ class ImageManager {
for: .applicationSupportDirectory, in: .userDomainMask for: .applicationSupportDirectory, in: .userDomainMask
).first ).first
else { else {
print("ERROR: Could not access Application Support directory") logError("ERROR: Could not access Application Support directory")
return nil return nil
} }
@@ -908,13 +907,13 @@ class ImageManager {
} }
} }
} catch { } catch {
print("ERROR: Error scanning for previous Application Support directories: \(error)") logError("ERROR: Error scanning for previous Application Support directories: \(error)")
} }
return nil return nil
} }
private func migratePreviousAppSupportImages(from sourceDirectory: URL) { private func migratePreviousAppSupportImages(from sourceDirectory: URL) {
print("Migrating images from previous Application Support directory") logInfo("Migrating images from previous Application Support directory")
do { do {
let imageFiles = try fileManager.contentsOfDirectory(atPath: sourceDirectory.path) let imageFiles = try fileManager.contentsOfDirectory(atPath: sourceDirectory.path)
@@ -937,18 +936,33 @@ class ImageManager {
// Create backup // Create backup
try? fileManager.copyItem(at: sourcePath, to: backupPath) try? fileManager.copyItem(at: sourcePath, to: backupPath)
print("Migrated: \(fileName)") logInfo("Migrated: \(fileName)")
} catch { } catch {
print("ERROR: Failed to migrate \(fileName): \(error)") logError("ERROR: Failed to migrate \(fileName): \(error)")
} }
} }
} }
print("Completed migration from previous Application Support directory") logInfo("Completed migration from previous Application Support directory")
} catch { } catch {
print("ERROR: Failed to migrate from previous Application Support: \(error)") logError("ERROR: Failed to migrate from previous Application Support: \(error)")
} }
} }
private func logInfo(_ message: String) {
AppLogger.info(message, tag: logTag)
}
private func logWarning(_ message: String) {
AppLogger.warning(message, tag: logTag)
}
private func logError(_ message: String) {
AppLogger.error(message, tag: logTag)
}
private func logDebug(_ message: String) {
AppLogger.debug(message, tag: logTag)
}
} }

52
ios/Ascently/Utils/ZipUtils.swift
View File

@@ -4,6 +4,8 @@ import zlib
struct ZipUtils { struct ZipUtils {
private static let logTag = "ZipUtils"
private static let DATA_JSON_FILENAME = "data.json" private static let DATA_JSON_FILENAME = "data.json"
private static let IMAGES_DIR_NAME = "images" private static let IMAGES_DIR_NAME = "images"
private static let METADATA_FILENAME = "metadata.txt" private static let METADATA_FILENAME = "metadata.txt"
@@ -49,7 +51,7 @@ struct ZipUtils {
) )
// Process images in batches for better performance // Process images in batches for better performance
print("Processing \(referencedImagePaths.count) images for export") logInfo("Processing \(referencedImagePaths.count) images for export")
var successfulImages = 0 var successfulImages = 0
let batchSize = 10 let batchSize = 10
let sortedPaths = Array(referencedImagePaths).sorted() let sortedPaths = Array(referencedImagePaths).sorted()
@@ -59,7 +61,7 @@ struct ZipUtils {
for (index, imagePath) in sortedPaths.enumerated() { for (index, imagePath) in sortedPaths.enumerated() {
if index % batchSize == 0 { if index % batchSize == 0 {
print("Processing images \(index)/\(sortedPaths.count)") logInfo("Processing images \(index)/\(sortedPaths.count)")
} }
let imageURL = URL(fileURLWithPath: imagePath) let imageURL = URL(fileURLWithPath: imagePath)
@@ -83,11 +85,11 @@ struct ZipUtils {
successfulImages += 1 successfulImages += 1
} }
} catch { } catch {
print("Failed to read image: \(imageName)") logWarning("Failed to read image: \(imageName)")
} }
} }
print("Export: included \(successfulImages)/\(referencedImagePaths.count) images") logInfo("Export: included \(successfulImages)/\(referencedImagePaths.count) images")
// Build central directory // Build central directory
centralDirectory.reserveCapacity(fileEntries.count * 100) // Estimate 100 bytes per entry centralDirectory.reserveCapacity(fileEntries.count * 100) // Estimate 100 bytes per entry
@@ -114,7 +116,7 @@ struct ZipUtils {
} }
static func extractImportZip(data: Data) throws -> ImportResult { static func extractImportZip(data: Data) throws -> ImportResult {
print("Starting ZIP extraction - data size: \(data.count) bytes") logInfo("Starting ZIP extraction - data size: \(data.count) bytes")
return try extractUsingCustomParser(data: data) return try extractUsingCustomParser(data: data)
} }
@@ -127,10 +129,10 @@ struct ZipUtils {
let zipEntries: [ZipEntry] let zipEntries: [ZipEntry]
do { do {
zipEntries = try parseZipFile(data: data) zipEntries = try parseZipFile(data: data)
print("Successfully parsed ZIP file with \(zipEntries.count) entries") logInfo("Successfully parsed ZIP file with \(zipEntries.count) entries")
} catch { } catch {
print("Failed to parse ZIP file: \(error)") logError("Failed to parse ZIP file: \(error)")
print( logError(
"ZIP data header: \(data.prefix(20).map { String(format: "%02X", $0) }.joined(separator: " "))" "ZIP data header: \(data.prefix(20).map { String(format: "%02X", $0) }.joined(separator: " "))"
) )
throw NSError( throw NSError(
@@ -142,24 +144,24 @@ struct ZipUtils {
) )
} }
print("Found \(zipEntries.count) entries in ZIP file:") logInfo("Found \(zipEntries.count) entries in ZIP file:")
for entry in zipEntries { for entry in zipEntries {
print(" - \(entry.filename) (size: \(entry.data.count) bytes)") logInfo(" - \(entry.filename) (size: \(entry.data.count) bytes)")
} }
for entry in zipEntries { for entry in zipEntries {
switch entry.filename { switch entry.filename {
case METADATA_FILENAME: case METADATA_FILENAME:
metadataContent = String(data: entry.data, encoding: .utf8) ?? "" metadataContent = String(data: entry.data, encoding: .utf8) ?? ""
print("Found metadata: \(metadataContent.prefix(100))...") logInfo("Found metadata: \(metadataContent.prefix(100))...")
case DATA_JSON_FILENAME: case DATA_JSON_FILENAME:
jsonContent = String(data: entry.data, encoding: .utf8) ?? "" jsonContent = String(data: entry.data, encoding: .utf8) ?? ""
print("Found data.json with \(jsonContent.count) characters") logInfo("Found data.json with \(jsonContent.count) characters")
if jsonContent.isEmpty { if jsonContent.isEmpty {
print("WARNING: data.json is empty!") logWarning("WARNING: data.json is empty!")
} else { } else {
print("data.json preview: \(jsonContent.prefix(200))...") logInfo("data.json preview: \(jsonContent.prefix(200))...")
} }
default: default:
@@ -173,17 +175,17 @@ struct ZipUtils {
entry.data, filename: originalFilename) entry.data, filename: originalFilename)
importedImagePaths[originalFilename] = filename importedImagePaths[originalFilename] = filename
} catch { } catch {
print("Failed to import image \(originalFilename): \(error)") logError("Failed to import image \(originalFilename): \(error)")
} }
} }
} }
} }
guard !jsonContent.isEmpty else { guard !jsonContent.isEmpty else {
print("ERROR: data.json not found or empty") logError("ERROR: data.json not found or empty")
print("Available files in ZIP:") logInfo("Available files in ZIP:")
for entry in zipEntries { for entry in zipEntries {
print(" - \(entry.filename)") logInfo(" - \(entry.filename)")
} }
throw NSError( throw NSError(
domain: "ImportError", code: 1, domain: "ImportError", code: 1,
@@ -194,13 +196,25 @@ struct ZipUtils {
) )
} }
print("Import extraction completed: \(importedImagePaths.count) images processed") logInfo("Import extraction completed: \(importedImagePaths.count) images processed")
return ImportResult( return ImportResult(
jsonData: jsonContent.data(using: .utf8) ?? Data(), imagePathMapping: importedImagePaths jsonData: jsonContent.data(using: .utf8) ?? Data(), imagePathMapping: importedImagePaths
) )
} }
private static func logInfo(_ message: String) {
AppLogger.info(message, tag: logTag)
}
private static func logWarning(_ message: String) {
AppLogger.warning(message, tag: logTag)
}
private static func logError(_ message: String) {
AppLogger.error(message, tag: logTag)
}
private static func createMetadata( private static func createMetadata(
exportData: ClimbDataBackup, exportData: ClimbDataBackup,
referencedImagePaths: Set<String> referencedImagePaths: Set<String>

210
ios/Ascently/ViewModels/ClimbingDataManager.swift
View File

@@ -38,7 +38,6 @@ class ClimbingDataManager: ObservableObject {
let healthKitService = HealthKitService.shared let healthKitService = HealthKitService.shared
@Published var isSyncing = false @Published var isSyncing = false
private enum Keys { private enum Keys {
static let gyms = "ascently_gyms" static let gyms = "ascently_gyms"
static let problems = "ascently_problems" static let problems = "ascently_problems"
@@ -115,7 +114,8 @@ class ClimbingDataManager: ObservableObject {
return return
} }
print("Starting migration from OpenClimb to Ascently keys...") AppLogger.info(
"Starting migration from OpenClimb to Ascently keys...", tag: LogTag.climbingData)
var migrationCount = 0 var migrationCount = 0
// Migrate each data type if it exists in old format but not in new format // Migrate each data type if it exists in old format but not in new format
@@ -135,7 +135,7 @@ class ClimbingDataManager: ObservableObject {
userDefaults.set(oldData, forKey: newKey) userDefaults.set(oldData, forKey: newKey)
userDefaults.removeObject(forKey: oldKey) userDefaults.removeObject(forKey: oldKey)
migrationCount += 1 migrationCount += 1
print("✅ Migrated: \(oldKey) → \(newKey)") AppLogger.info("Migrated: \(oldKey) → \(newKey)", tag: LogTag.climbingData)
} }
} }
@@ -147,7 +147,8 @@ class ClimbingDataManager: ObservableObject {
{ {
sharedDefaults.set(oldData, forKey: newKey) sharedDefaults.set(oldData, forKey: newKey)
sharedDefaults.removeObject(forKey: oldKey) sharedDefaults.removeObject(forKey: oldKey)
print("✅ Migrated shared: \(oldKey) → \(newKey)") AppLogger.info(
"Migrated shared: \(oldKey) → \(newKey)", tag: LogTag.climbingData)
} }
} }
} }
@@ -161,18 +162,19 @@ class ClimbingDataManager: ObservableObject {
userDefaults.set(lastModified, forKey: newDataStateKey) userDefaults.set(lastModified, forKey: newDataStateKey)
userDefaults.removeObject(forKey: legacyDataStateKey) userDefaults.removeObject(forKey: legacyDataStateKey)
migrationCount += 1 migrationCount += 1
print("✅ Migrated data state timestamp") AppLogger.info("Migrated data state timestamp", tag: LogTag.climbingData)
} }
// Mark migration as completed // Mark migration as completed
userDefaults.set(true, forKey: migrationKey) userDefaults.set(true, forKey: migrationKey)
if migrationCount > 0 { if migrationCount > 0 {
print( AppLogger.info(
"Migration completed! Migrated \(migrationCount) data items from OpenClimb to Ascently" "Migration completed! Migrated \(migrationCount) data items from OpenClimb to Ascently",
tag: LogTag.climbingData
) )
} else { } else {
print("No OpenClimb data found to migrate") AppLogger.info("No OpenClimb data found to migrate", tag: LogTag.climbingData)
} }
} }
@@ -441,7 +443,9 @@ class ClimbingDataManager: ObservableObject {
startDate: newSession.startTime ?? Date(), startDate: newSession.startTime ?? Date(),
sessionId: newSession.id) sessionId: newSession.id)
} catch { } catch {
print("Failed to start HealthKit workout: \(error.localizedDescription)") AppLogger.error(
"Failed to start HealthKit workout: \(error.localizedDescription)",
tag: LogTag.climbingData)
} }
} }
} }
@@ -477,7 +481,9 @@ class ClimbingDataManager: ObservableObject {
try await healthKitService.endWorkout( try await healthKitService.endWorkout(
endDate: completedSession.endTime ?? Date()) endDate: completedSession.endTime ?? Date())
} catch { } catch {
print("Failed to end HealthKit workout: \(error.localizedDescription)") AppLogger.error(
"Failed to end HealthKit workout: \(error.localizedDescription)",
tag: LogTag.climbingData)
} }
} }
} }
@@ -667,7 +673,9 @@ class ClimbingDataManager: ObservableObject {
} }
if !orphanedAttempts.isEmpty { if !orphanedAttempts.isEmpty {
print("🧹 Cleaning up \(orphanedAttempts.count) orphaned attempts") AppLogger.info(
"🧹 Cleaning up \(orphanedAttempts.count) orphaned attempts",
tag: LogTag.climbingData)
// Track these as deleted to prevent sync from re-introducing them // Track these as deleted to prevent sync from re-introducing them
for attempt in orphanedAttempts { for attempt in orphanedAttempts {
@@ -693,14 +701,15 @@ class ClimbingDataManager: ObservableObject {
if seenAttempts.contains(key) { if seenAttempts.contains(key) {
duplicateIds.append(attempt.id) duplicateIds.append(attempt.id)
print("🧹 Found duplicate attempt: \(attempt.id)") AppLogger.info("🧹 Found duplicate attempt: \(attempt.id)", tag: LogTag.climbingData)
} else { } else {
seenAttempts.insert(key) seenAttempts.insert(key)
} }
} }
if !duplicateIds.isEmpty { if !duplicateIds.isEmpty {
print("🧹 Removing \(duplicateIds.count) duplicate attempts") AppLogger.info(
"🧹 Removing \(duplicateIds.count) duplicate attempts", tag: LogTag.climbingData)
// Track duplicates as deleted // Track duplicates as deleted
for attemptId in duplicateIds { for attemptId in duplicateIds {
@@ -714,8 +723,9 @@ class ClimbingDataManager: ObservableObject {
if initialAttemptCount != attempts.count { if initialAttemptCount != attempts.count {
saveAttempts() saveAttempts()
let removedCount = initialAttemptCount - attempts.count let removedCount = initialAttemptCount - attempts.count
print( AppLogger.info(
"Cleanup complete. Removed \(removedCount) attempts. Remaining: \(attempts.count)" "Cleanup complete. Removed \(removedCount) attempts. Remaining: \(attempts.count)",
tag: LogTag.climbingData
) )
} }
@@ -725,7 +735,9 @@ class ClimbingDataManager: ObservableObject {
} }
if !orphanedProblems.isEmpty { if !orphanedProblems.isEmpty {
print("🧹 Cleaning up \(orphanedProblems.count) orphaned problems") AppLogger.info(
"🧹 Cleaning up \(orphanedProblems.count) orphaned problems",
tag: LogTag.climbingData)
for problem in orphanedProblems { for problem in orphanedProblems {
trackDeletion(itemId: problem.id.uuidString, itemType: "problem") trackDeletion(itemId: problem.id.uuidString, itemType: "problem")
@@ -744,7 +756,9 @@ class ClimbingDataManager: ObservableObject {
} }
if !orphanedSessions.isEmpty { if !orphanedSessions.isEmpty {
print("🧹 Cleaning up \(orphanedSessions.count) orphaned sessions") AppLogger.info(
"🧹 Cleaning up \(orphanedSessions.count) orphaned sessions",
tag: LogTag.climbingData)
for session in orphanedSessions { for session in orphanedSessions {
trackDeletion(itemId: session.id.uuidString, itemType: "session") trackDeletion(itemId: session.id.uuidString, itemType: "session")
@@ -844,19 +858,29 @@ class ClimbingDataManager: ObservableObject {
let problemsForImages = problems let problemsForImages = problems
// Move heavy I/O operations to background thread // Move heavy I/O operations to background thread
let logTag = LogTag.climbingData
let zipData = try await Task.detached(priority: .userInitiated) { let zipData = try await Task.detached(priority: .userInitiated) {
// Collect actual image paths from disk for the ZIP // Collect actual image paths from disk for the ZIP
let referencedImagePaths = await Self.collectReferencedImagePathsStatic( let imageSummary = Self.collectReferencedImagePathsStatic(
problems: problemsForImages, problems: problemsForImages,
imagesDirectory: imagesDirectory) imagesDirectory: imagesDirectory)
print("Starting export with \(referencedImagePaths.count) images") let referencedImagePaths = imageSummary.paths
await MainActor.run {
AppLogger.info(
"Starting export with \(referencedImagePaths.count) images (\(imageSummary.missingCount) missing)",
tag: logTag)
}
let zipData = try await ZipUtils.createExportZip( let zipData = try await ZipUtils.createExportZip(
exportData: exportData, exportData: exportData,
referencedImagePaths: referencedImagePaths referencedImagePaths: referencedImagePaths
) )
print("Export completed successfully") await MainActor.run {
AppLogger.info("Export completed successfully", tag: logTag)
}
return (zipData, referencedImagePaths.count) return (zipData, referencedImagePaths.count)
}.value }.value
@@ -865,7 +889,7 @@ class ClimbingDataManager: ObservableObject {
return zipData.0 return zipData.0
} catch { } catch {
let errorMessage = "Export failed: \(error.localizedDescription)" let errorMessage = "Export failed: \(error.localizedDescription)"
print("ERROR: \(errorMessage)") AppLogger.error("ERROR: \(errorMessage)", tag: LogTag.climbingData)
setError(errorMessage) setError(errorMessage)
return nil return nil
} }
@@ -894,16 +918,24 @@ class ClimbingDataManager: ObservableObject {
return Date() return Date()
} }
print("Raw JSON content preview:") AppLogger.debug("Raw JSON content preview:", tag: LogTag.climbingData)
print(String(decoding: importResult.jsonData.prefix(500), as: UTF8.self) + "...") AppLogger.debug(
String(decoding: importResult.jsonData.prefix(500), as: UTF8.self) + "...",
tag: LogTag.climbingData
)
let importData = try decoder.decode(ClimbDataBackup.self, from: importResult.jsonData) let importData = try decoder.decode(ClimbDataBackup.self, from: importResult.jsonData)
print("Successfully decoded import data:") AppLogger.info(
print("- Gyms: \(importData.gyms.count)") """
print("- Problems: \(importData.problems.count)") Successfully decoded import data:
print("- Sessions: \(importData.sessions.count)") - Gyms: \(importData.gyms.count)
print("- Attempts: \(importData.attempts.count)") - Problems: \(importData.problems.count)
- Sessions: \(importData.sessions.count)
- Attempts: \(importData.attempts.count)
""",
tag: LogTag.climbingData
)
try validateImportData(importData) try validateImportData(importData)
@@ -960,14 +992,20 @@ class ClimbingDataManager: ObservableObject {
extension ClimbingDataManager { extension ClimbingDataManager {
private func collectReferencedImagePaths() -> Set<String> { private func collectReferencedImagePaths() -> Set<String> {
let imagesDirectory = ImageManager.shared.imagesDirectory.path let imagesDirectory = ImageManager.shared.imagesDirectory.path
return Self.collectReferencedImagePathsStatic( let result = Self.collectReferencedImagePathsStatic(
problems: problems, problems: problems,
imagesDirectory: imagesDirectory) imagesDirectory: imagesDirectory)
AppLogger.info(
"Export: Collected \(result.paths.count) images (\(result.missingCount) missing)",
tag: LogTag.climbingData)
return result.paths
} }
private static func collectReferencedImagePathsStatic( nonisolated private static func collectReferencedImagePathsStatic(
problems: [Problem], imagesDirectory: String problems: [Problem], imagesDirectory: String
) -> Set<String> { ) -> (paths: Set<String>, missingCount: Int) {
var imagePaths = Set<String>() var imagePaths = Set<String>()
var missingCount = 0 var missingCount = 0
@@ -988,8 +1026,7 @@ extension ClimbingDataManager {
} }
} }
print("Export: Collected \(imagePaths.count) images (\(missingCount) missing)") return (imagePaths, missingCount)
return imagePaths
} }
private func updateProblemImagePaths( private func updateProblemImagePaths(
@@ -1030,11 +1067,14 @@ extension ClimbingDataManager {
} }
deterministicImagePaths.append(deterministicName) deterministicImagePaths.append(deterministicName)
print("Renamed imported image: \(tempFileName) → \(deterministicName)") AppLogger.debug(
"Renamed imported image: \(tempFileName) → \(deterministicName)",
tag: LogTag.climbingData)
} }
} catch { } catch {
print( AppLogger.error(
"Failed to rename imported image \(tempFileName) to \(deterministicName): \(error)" "Failed to rename imported image \(tempFileName) to \(deterministicName): \(error)",
tag: LogTag.climbingData
) )
deterministicImagePaths.append(tempFileName) deterministicImagePaths.append(tempFileName)
} }
@@ -1078,7 +1118,8 @@ extension ClimbingDataManager {
if needsUpdate { if needsUpdate {
problems = updatedProblems problems = updatedProblems
saveProblems() saveProblems()
print("Migrated image paths for \(problems.count) problems") AppLogger.info(
"Migrated image paths for \(problems.count) problems", tag: LogTag.climbingData)
} }
} }
@@ -1089,8 +1130,9 @@ extension ClimbingDataManager {
// Log storage information for debugging // Log storage information for debugging
let info = await ImageManager.shared.getStorageInfo() let info = await ImageManager.shared.getStorageInfo()
print( await AppLogger.debug(
"Image Storage: \(info.primaryCount) primary, \(info.backupCount) backup, \(info.totalSize / 1024)KB total" "Image Storage: \(info.primaryCount) primary, \(info.backupCount) backup, \(info.totalSize / 1024)KB total",
tag: LogTag.climbingData
) )
}.value }.value
} }
@@ -1128,7 +1170,9 @@ extension ClimbingDataManager {
} }
if !orphanedFiles.isEmpty { if !orphanedFiles.isEmpty {
print("Cleaned up \(orphanedFiles.count) orphaned image files") AppLogger.info(
"Cleaned up \(orphanedFiles.count) orphaned image files",
tag: LogTag.climbingData)
} }
} }
} }
@@ -1145,7 +1189,7 @@ extension ClimbingDataManager {
} }
func forceImageRecovery() { func forceImageRecovery() {
print("User initiated force image recovery") AppLogger.info("User initiated force image recovery", tag: LogTag.climbingData)
ImageManager.shared.forceRecoveryMigration() ImageManager.shared.forceRecoveryMigration()
// Refresh the UI after recovery // Refresh the UI after recovery
@@ -1153,7 +1197,7 @@ extension ClimbingDataManager {
} }
func emergencyImageRestore() { func emergencyImageRestore() {
print("User initiated emergency image restore") AppLogger.info("User initiated emergency image restore", tag: LogTag.climbingData)
ImageManager.shared.emergencyImageRestore() ImageManager.shared.emergencyImageRestore()
// Refresh the UI after restore // Refresh the UI after restore
@@ -1179,15 +1223,15 @@ extension ClimbingDataManager {
} }
func testLiveActivity() { func testLiveActivity() {
print("🧪 Testing Live Activity functionality...") AppLogger.info("Testing Live Activity functionality...", tag: LogTag.climbingData)
// Check Live Activity availability // Check Live Activity availability
let status = LiveActivityManager.shared.checkLiveActivityAvailability() let status = LiveActivityManager.shared.checkLiveActivityAvailability()
print(status) AppLogger.info(status, tag: LogTag.climbingData)
// Test with dummy data if we have a gym // Test with dummy data if we have a gym
guard let testGym = gyms.first else { guard let testGym = gyms.first else {
print("ERROR: No gyms available for testing") AppLogger.error("No gyms available for testing", tag: LogTag.climbingData)
return return
} }
@@ -1218,15 +1262,18 @@ extension ClimbingDataManager {
// Only restart if session is actually active // Only restart if session is actually active
guard activeSession.status == .active else { guard activeSession.status == .active else {
print( AppLogger.warning(
"WARNING: Session exists but is not active (status: \(activeSession.status)), ending Live Activity" "Session exists but is not active (status: \(activeSession.status)), ending Live Activity",
tag: LogTag.climbingData
) )
await LiveActivityManager.shared.endLiveActivity() await LiveActivityManager.shared.endLiveActivity()
return return
} }
if let gym = gym(withId: activeSession.gymId) { if let gym = gym(withId: activeSession.gymId) {
print("Checking Live Activity for active session at \(gym.name)") AppLogger.info(
"Checking Live Activity for active session at \(gym.name)", tag: LogTag.climbingData
)
// First cleanup any dismissed activities // First cleanup any dismissed activities
await LiveActivityManager.shared.cleanupDismissedActivities() await LiveActivityManager.shared.cleanupDismissedActivities()
@@ -1241,7 +1288,9 @@ extension ClimbingDataManager {
/// Call this when app becomes active to check for Live Activity restart /// Call this when app becomes active to check for Live Activity restart
func onAppBecomeActive() { func onAppBecomeActive() {
print("App became active - checking Live Activity status") let logTag = "ClimbingData"
AppLogger.info(
"App became active - checking Live Activity status", tag: logTag)
Task { Task {
await checkAndRestartLiveActivity() await checkAndRestartLiveActivity()
} }
@@ -1249,35 +1298,46 @@ extension ClimbingDataManager {
/// Call this when app enters background to update Live Activity /// Call this when app enters background to update Live Activity
func onAppEnterBackground() { func onAppEnterBackground() {
print("App entering background - updating Live Activity if needed") let logTag = "ClimbingData"
AppLogger.info(
"App entering background - updating Live Activity if needed", tag: logTag)
Task { Task {
await updateLiveActivityData() await updateLiveActivityData()
} }
} }
/// Setup notifications for Live Activity events /// Setup notifications for Live Activity events
private func setupLiveActivityNotifications() { nonisolated private func setupLiveActivityNotifications() {
let notificationName = Notification.Name("liveActivityDismissed")
let logTag = "ClimbingData"
liveActivityObserver = NotificationCenter.default.addObserver( liveActivityObserver = NotificationCenter.default.addObserver(
forName: .liveActivityDismissed, forName: notificationName,
object: nil, object: nil,
queue: .main queue: .main
) { [weak self] _ in ) { [weak self] _ in
print("🔔 Received Live Activity dismissed notification - attempting restart")
Task { @MainActor in Task { @MainActor in
AppLogger.info(
"Received Live Activity dismissed notification - attempting restart",
tag: logTag)
await self?.handleLiveActivityDismissed() await self?.handleLiveActivityDismissed()
} }
} }
} }
private func setupMigrationNotifications() { nonisolated private func setupMigrationNotifications() {
let logTag = "ClimbingData"
migrationObserver = NotificationCenter.default.addObserver( migrationObserver = NotificationCenter.default.addObserver(
forName: NSNotification.Name("ImageMigrationCompleted"), forName: NSNotification.Name("ImageMigrationCompleted"),
object: nil, object: nil,
queue: .main queue: .main
) { [weak self] notification in ) { [weak self] notification in
if let updateCount = notification.userInfo?["updateCount"] as? Int { if let updateCount = notification.userInfo?["updateCount"] as? Int {
print("🔔 Image migration completed with \(updateCount) updates - reloading data")
Task { @MainActor in Task { @MainActor in
AppLogger.info(
"Image migration completed with \(updateCount) updates - reloading data",
tag: logTag)
self?.loadProblems() self?.loadProblems()
} }
} }
@@ -1293,7 +1353,9 @@ extension ClimbingDataManager {
return return
} }
print("Attempting to restart dismissed Live Activity for \(gym.name)") AppLogger.info(
"Attempting to restart dismissed Live Activity for \(gym.name)",
tag: LogTag.climbingData)
// Wait a bit before restarting to avoid frequency limits // Wait a bit before restarting to avoid frequency limits
try? await Task.sleep(nanoseconds: 2_000_000_000) // 2 seconds try? await Task.sleep(nanoseconds: 2_000_000_000) // 2 seconds
@@ -1333,11 +1395,20 @@ extension ClimbingDataManager {
activeSession.status == .active, activeSession.status == .active,
let gym = gym(withId: activeSession.gymId) let gym = gym(withId: activeSession.gymId)
else { else {
print("WARNING: Live Activity update skipped - no active session or gym") AppLogger.warning(
"Live Activity update skipped - no active session or gym",
tag: LogTag.climbingData
)
if let session = activeSession { if let session = activeSession {
print(" Session ID: \(session.id)") AppLogger.debug(
print(" Session Status: \(session.status)") """
print(" Gym ID: \(session.gymId)") Skipped session details:
Session ID: \(session.id)
Session Status: \(session.status)
Gym ID: \(session.gymId)
""",
tag: LogTag.climbingData
)
} }
return return
} }
@@ -1357,14 +1428,17 @@ extension ClimbingDataManager {
elapsedInterval = 0 elapsedInterval = 0
} }
print("Live Activity Update Debug:") AppLogger.debug(
print(" Session ID: \(activeSession.id)") """
print(" Gym: \(gym.name)") Live Activity Update Debug:
print(" Total attempts in session: \(totalAttempts)") Session ID: \(activeSession.id)
print(" Completed problems: \(completedProblems)") Gym: \(gym.name)
print(" Elapsed time: \(elapsedInterval) seconds") Total attempts in session: \(totalAttempts)
print( Completed problems: \(completedProblems)
" All attempts for session: \(attemptsForSession.map { "\($0.result) - Problem: \($0.problemId)" })" Elapsed time: \(elapsedInterval) seconds
All attempts for session: \(attemptsForSession.map { "\($0.result) - Problem: \($0.problemId)" })
""",
tag: LogTag.climbingData
) )
Task { Task {

74
ios/Ascently/ViewModels/LiveActivityManager.swift
View File

@@ -8,6 +8,7 @@ extension Notification.Name {
@MainActor @MainActor
final class LiveActivityManager { final class LiveActivityManager {
static let shared = LiveActivityManager() static let shared = LiveActivityManager()
private static let logTag = "LiveActivity"
private init() {} private init() {}
nonisolated(unsafe) private var currentActivity: Activity<SessionActivityAttributes>? nonisolated(unsafe) private var currentActivity: Activity<SessionActivityAttributes>?
@@ -30,11 +31,12 @@ final class LiveActivityManager {
let isStillActive = activities.contains { $0.id == currentActivity.id } let isStillActive = activities.contains { $0.id == currentActivity.id }
if isStillActive { if isStillActive {
print("Live Activity still running: \(currentActivity.id)") AppLogger.debug("Live Activity still running: \(currentActivity.id)", tag: Self.logTag)
return return
} else { } else {
print( AppLogger.warning(
"WARNING: Tracked Live Activity \(currentActivity.id) was dismissed, clearing reference" "Tracked Live Activity \(currentActivity.id) was dismissed, clearing reference",
tag: Self.logTag
) )
self.currentActivity = nil self.currentActivity = nil
} }
@@ -43,18 +45,18 @@ final class LiveActivityManager {
// Check if there are ANY active Live Activities for this session // Check if there are ANY active Live Activities for this session
let existingActivities = Activity<SessionActivityAttributes>.activities let existingActivities = Activity<SessionActivityAttributes>.activities
if let existingActivity = existingActivities.first { if let existingActivity = existingActivities.first {
print("Found existing Live Activity: \(existingActivity.id), using it") AppLogger.info("Found existing Live Activity: \(existingActivity.id), using it", tag: Self.logTag)
self.currentActivity = existingActivity self.currentActivity = existingActivity
return return
} }
print("No Live Activity found, restarting for existing session") AppLogger.info("No Live Activity found, restarting for existing session", tag: Self.logTag)
await startLiveActivity(for: activeSession, gymName: gymName) await startLiveActivity(for: activeSession, gymName: gymName)
} }
/// Call this when a ClimbSession starts to begin a Live Activity /// Call this when a ClimbSession starts to begin a Live Activity
func startLiveActivity(for session: ClimbSession, gymName: String) async { func startLiveActivity(for session: ClimbSession, gymName: String) async {
print("Starting Live Activity for gym: \(gymName)") AppLogger.info("Starting Live Activity for gym: \(gymName)", tag: Self.logTag)
await endLiveActivity() await endLiveActivity()
@@ -80,18 +82,26 @@ final class LiveActivityManager {
pushType: nil pushType: nil
) )
self.currentActivity = activity self.currentActivity = activity
print("Live Activity started successfully: \(activity.id)") AppLogger.info("Live Activity started successfully: \(activity.id)", tag: Self.logTag)
} catch { } catch {
print("ERROR: Failed to start live activity: \(error)") AppLogger.error(
print("Error details: \(error.localizedDescription)") """
Failed to start live activity: \(error)
Details: \(error.localizedDescription)
""",
tag: Self.logTag
)
// Check specific error types // Check specific error types
if error.localizedDescription.contains("authorization") { if error.localizedDescription.contains("authorization") {
print("Authorization error - check Live Activity permissions in Settings") AppLogger.warning(
"Authorization error - check Live Activity permissions in Settings",
tag: Self.logTag
)
} else if error.localizedDescription.contains("content") { } else if error.localizedDescription.contains("content") {
print("Content error - check ActivityAttributes structure") AppLogger.warning("Content error - check ActivityAttributes structure", tag: Self.logTag)
} else if error.localizedDescription.contains("frequencyLimited") { } else if error.localizedDescription.contains("frequencyLimited") {
print("Frequency limited - too many Live Activities started recently") AppLogger.warning("Frequency limited - too many Live Activities started recently", tag: Self.logTag)
} }
} }
} }
@@ -100,7 +110,7 @@ final class LiveActivityManager {
func updateLiveActivity(elapsed: TimeInterval, totalAttempts: Int, completedProblems: Int) async func updateLiveActivity(elapsed: TimeInterval, totalAttempts: Int, completedProblems: Int) async
{ {
guard let currentActivity = currentActivity else { guard let currentActivity = currentActivity else {
print("WARNING: No current activity to update") AppLogger.warning("No current activity to update", tag: Self.logTag)
return return
} }
@@ -109,15 +119,17 @@ final class LiveActivityManager {
let isStillActive = activities.contains { $0.id == currentActivity.id } let isStillActive = activities.contains { $0.id == currentActivity.id }
if !isStillActive { if !isStillActive {
print( AppLogger.warning(
"WARNING: Tracked Live Activity \(currentActivity.id) is no longer active, clearing reference" "Tracked Live Activity \(currentActivity.id) is no longer active, clearing reference",
tag: Self.logTag
) )
self.currentActivity = nil self.currentActivity = nil
return return
} }
print( AppLogger.debug(
"Updating Live Activity - Attempts: \(totalAttempts), Completed: \(completedProblems)" "Updating Live Activity - Attempts: \(totalAttempts), Completed: \(completedProblems)",
tag: Self.logTag
) )
let updatedContentState = SessionActivityAttributes.ContentState( let updatedContentState = SessionActivityAttributes.ContentState(
@@ -137,26 +149,26 @@ final class LiveActivityManager {
// First end the tracked activity if it exists // First end the tracked activity if it exists
if let currentActivity { if let currentActivity {
print("Ending tracked Live Activity: \(currentActivity.id)") AppLogger.info("Ending tracked Live Activity: \(currentActivity.id)", tag: Self.logTag)
nonisolated(unsafe) let activity = currentActivity nonisolated(unsafe) let activity = currentActivity
await activity.end(nil, dismissalPolicy: .immediate) await activity.end(nil, dismissalPolicy: .immediate)
self.currentActivity = nil self.currentActivity = nil
print("Tracked Live Activity ended successfully") AppLogger.info("Tracked Live Activity ended successfully", tag: Self.logTag)
} }
// Force end ALL active activities of our type to ensure cleanup // Force end ALL active activities of our type to ensure cleanup
print("Checking for any remaining active activities...") AppLogger.debug("Checking for any remaining active activities...", tag: Self.logTag)
let activities = Activity<SessionActivityAttributes>.activities let activities = Activity<SessionActivityAttributes>.activities
if activities.isEmpty { if activities.isEmpty {
print("No additional activities found") AppLogger.debug("No additional activities found", tag: Self.logTag)
} else { } else {
print("Found \(activities.count) additional active activities, ending them...") AppLogger.info("Found \(activities.count) additional active activities, ending them...", tag: Self.logTag)
for activity in activities { for activity in activities {
print("Force ending activity: \(activity.id)") AppLogger.debug("Force ending activity: \(activity.id)", tag: Self.logTag)
await activity.end(nil, dismissalPolicy: .immediate) await activity.end(nil, dismissalPolicy: .immediate)
} }
print("All Live Activities ended successfully") AppLogger.info("All Live Activities ended successfully", tag: Self.logTag)
} }
} }
@@ -174,7 +186,7 @@ final class LiveActivityManager {
• All Active Activities: \(allActivities.count) • All Active Activities: \(allActivities.count)
""" """
print(message) AppLogger.info(message, tag: Self.logTag)
return message return message
} }
@@ -185,7 +197,7 @@ final class LiveActivityManager {
if let currentActivity = currentActivity { if let currentActivity = currentActivity {
let isStillActive = activities.contains { $0.id == currentActivity.id } let isStillActive = activities.contains { $0.id == currentActivity.id }
if !isStillActive { if !isStillActive {
print("Cleaning up dismissed Live Activity: \(currentActivity.id)") AppLogger.info("Cleaning up dismissed Live Activity: \(currentActivity.id)", tag: Self.logTag)
self.currentActivity = nil self.currentActivity = nil
} }
} }
@@ -195,7 +207,7 @@ final class LiveActivityManager {
func startHealthChecks() { func startHealthChecks() {
stopHealthChecks() // Stop any existing timer stopHealthChecks() // Stop any existing timer
print("🩺 Starting Live Activity health checks") AppLogger.debug("🩺 Starting Live Activity health checks", tag: Self.logTag)
healthCheckTimer = Timer.scheduledTimer(withTimeInterval: 30.0, repeats: true) { healthCheckTimer = Timer.scheduledTimer(withTimeInterval: 30.0, repeats: true) {
[weak self] _ in [weak self] _ in
Task { @MainActor [weak self] in Task { @MainActor [weak self] in
@@ -208,7 +220,7 @@ final class LiveActivityManager {
func stopHealthChecks() { func stopHealthChecks() {
healthCheckTimer?.invalidate() healthCheckTimer?.invalidate()
healthCheckTimer = nil healthCheckTimer = nil
print("Stopped Live Activity health checks") AppLogger.debug("Stopped Live Activity health checks", tag: Self.logTag)
} }
/// Perform a health check on the current Live Activity /// Perform a health check on the current Live Activity
@@ -221,14 +233,14 @@ final class LiveActivityManager {
// Only perform health check if it's been at least 25 seconds // Only perform health check if it's been at least 25 seconds
guard timeSinceLastCheck >= 25 else { return } guard timeSinceLastCheck >= 25 else { return }
print("🩺 Performing Live Activity health check") AppLogger.debug("🩺 Performing Live Activity health check", tag: Self.logTag)
lastHealthCheck = now lastHealthCheck = now
let activities = Activity<SessionActivityAttributes>.activities let activities = Activity<SessionActivityAttributes>.activities
let isStillActive = activities.contains { $0.id == currentActivity.id } let isStillActive = activities.contains { $0.id == currentActivity.id }
if !isStillActive { if !isStillActive {
print("Health check failed - Live Activity was dismissed") AppLogger.warning("Health check failed - Live Activity was dismissed", tag: Self.logTag)
self.currentActivity = nil self.currentActivity = nil
// Notify that we need to restart // Notify that we need to restart
@@ -237,7 +249,7 @@ final class LiveActivityManager {
object: nil object: nil
) )
} else { } else {
print("Live Activity health check passed") AppLogger.debug("Live Activity health check passed", tag: Self.logTag)
} }
} }

2
ios/Ascently/Views/LiveActivityDebugView.swift
View File

@@ -196,7 +196,7 @@ struct LiveActivityDebugView: View {
} }
isTestRunning = true isTestRunning = true
appendDebugOutput("🧪 Starting Live Activity test...") appendDebugOutput("Starting Live Activity test...")
Task { Task {
defer { defer {

1
ios/Ascently/Views/ProblemsView.swift
View File

@@ -317,7 +317,6 @@ struct ProblemsList: View {
} }
Button { Button {
// Use a spring animation for more natural movement
withAnimation(.spring(response: 0.5, dampingFraction: 0.8, blendDuration: 0.1)) withAnimation(.spring(response: 0.5, dampingFraction: 0.8, blendDuration: 0.1))
{ {
let updatedProblem = problem.updated(isActive: !problem.isActive) let updatedProblem = problem.updated(isActive: !problem.isActive)

49
ios/Ascently/Views/SettingsView.swift
View File

@@ -84,6 +84,8 @@ struct DataManagementSection: View {
@State private var isDeletingImages = false @State private var isDeletingImages = false
@State private var showingDeleteImagesAlert = false @State private var showingDeleteImagesAlert = false
private static let logTag = "DataManagementSection"
var body: some View { var body: some View {
Section("Data Management") { Section("Data Management") {
// Export Data // Export Data
@@ -217,13 +219,14 @@ struct DataManagementSection: View {
try fileManager.removeItem(at: imageFile) try fileManager.removeItem(at: imageFile)
deletedCount += 1 deletedCount += 1
} catch { } catch {
print("Failed to delete image: \(imageFile.lastPathComponent)") AppLogger.error(
"Failed to delete image: \(imageFile.lastPathComponent)", tag: Self.logTag)
} }
} }
print("Deleted \(deletedCount) image files") AppLogger.info("Deleted \(deletedCount) image files", tag: Self.logTag)
} catch { } catch {
print("Failed to access images directory: \(error)") AppLogger.error("Failed to access images directory: \(error)", tag: Self.logTag)
} }
// Delete all images from backup directory // Delete all images from backup directory
@@ -235,7 +238,7 @@ struct DataManagementSection: View {
try? fileManager.removeItem(at: backupFile) try? fileManager.removeItem(at: backupFile)
} }
} catch { } catch {
print("Failed to access backup directory: \(error)") AppLogger.error("Failed to access backup directory: \(error)", tag: Self.logTag)
} }
// Clear image paths from all problems // Clear image paths from all problems
@@ -260,20 +263,6 @@ struct AppInfoSection: View {
var body: some View { var body: some View {
Section("App Information") { Section("App Information") {
HStack {
Image("AppLogo")
.resizable()
.frame(width: 24, height: 24)
VStack(alignment: .leading) {
Text("Ascently")
.font(.headline)
Text("Track your climbing progress")
.font(.caption)
.foregroundColor(.secondary)
}
Spacer()
}
HStack { HStack {
Image(systemName: "info.circle") Image(systemName: "info.circle")
.foregroundColor(.blue) .foregroundColor(.blue)
@@ -292,11 +281,13 @@ struct ExportDataView: View {
@State private var tempFileURL: URL? @State private var tempFileURL: URL?
@State private var isCreatingFile = true @State private var isCreatingFile = true
private static let logTag = "ExportDataView"
var body: some View { var body: some View {
NavigationStack { NavigationStack {
VStack(spacing: 30) { VStack(spacing: 30) {
if isCreatingFile { if isCreatingFile {
// Loading state - more prominent // Loading state
VStack(spacing: 20) { VStack(spacing: 20) {
ProgressView() ProgressView()
.scaleEffect(1.5) .scaleEffect(1.5)
@@ -380,6 +371,7 @@ struct ExportDataView: View {
} }
private func createTempFile() { private func createTempFile() {
let logTag = Self.logTag // Capture before entering background queue
DispatchQueue.global(qos: .userInitiated).async { DispatchQueue.global(qos: .userInitiated).async {
do { do {
let formatter = ISO8601DateFormatter() let formatter = ISO8601DateFormatter()
@@ -394,7 +386,9 @@ struct ExportDataView: View {
for: .documentDirectory, in: .userDomainMask for: .documentDirectory, in: .userDomainMask
).first ).first
else { else {
print("Could not access Documents directory") Task { @MainActor in
AppLogger.error("Could not access Documents directory", tag: logTag)
}
DispatchQueue.main.async { DispatchQueue.main.async {
self.isCreatingFile = false self.isCreatingFile = false
} }
@@ -410,7 +404,9 @@ struct ExportDataView: View {
self.isCreatingFile = false self.isCreatingFile = false
} }
} catch { } catch {
print("Failed to create export file: \(error)") Task { @MainActor in
AppLogger.error("Failed to create export file: \(error)", tag: logTag)
}
DispatchQueue.main.async { DispatchQueue.main.async {
self.isCreatingFile = false self.isCreatingFile = false
} }
@@ -420,10 +416,12 @@ struct ExportDataView: View {
private func cleanupTempFile() { private func cleanupTempFile() {
if let fileURL = tempFileURL { if let fileURL = tempFileURL {
let logTag = Self.logTag // Capture before entering async closure
// Clean up after a delay to ensure sharing is complete // Clean up after a delay to ensure sharing is complete
DispatchQueue.main.asyncAfter(deadline: .now() + 5.0) { DispatchQueue.main.asyncAfter(deadline: .now() + 5.0) {
try? FileManager.default.removeItem(at: fileURL) try? FileManager.default.removeItem(at: fileURL)
print("Cleaned up export file: \(fileURL.lastPathComponent)") AppLogger.debug(
"Cleaned up export file: \(fileURL.lastPathComponent)", tag: logTag)
} }
} }
} }
@@ -435,6 +433,8 @@ struct SyncSection: View {
@State private var showingSyncSettings = false @State private var showingSyncSettings = false
@State private var showingDisconnectAlert = false @State private var showingDisconnectAlert = false
private static let logTag = "SyncSection"
var body: some View { var body: some View {
Section("Sync") { Section("Sync") {
// Sync Status // Sync Status
@@ -579,11 +579,14 @@ struct SyncSection: View {
} }
private func performSync() { private func performSync() {
let logTag = Self.logTag // Capture before entering async context
Task { Task {
do { do {
try await syncService.syncWithServer(dataManager: dataManager) try await syncService.syncWithServer(dataManager: dataManager)
} catch { } catch {
print("Sync failed: \(error)") await MainActor.run {
AppLogger.error("Sync failed: \(error)", tag: logTag)
}
} }
} }
} }