Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Legacy/BugTracker/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,7 @@ android {
}

dependencies {
implementation project(":Core:AppVersionChecker")
implementation project(':Core:Legacy')
implementation project(":Core:Network") // To access API URL
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,12 @@ import androidx.core.view.WindowInsetsCompat
import androidx.core.view.isGone
import androidx.core.view.isVisible
import androidx.core.widget.doOnTextChanged
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.flowWithLifecycle
import androidx.lifecycle.lifecycleScope
import androidx.navigation.navArgs
import com.infomaniak.core.appversionchecker.data.models.AppVersion
import com.infomaniak.core.legacy.bugtracker.databinding.ActivityBugTrackerBinding
import com.infomaniak.core.legacy.githubTools.GitHubViewModel
import com.infomaniak.core.legacy.utils.FilePicker
import com.infomaniak.core.legacy.utils.SnackbarUtils.showSnackbar
import com.infomaniak.core.legacy.utils.getFileNameAndSize
Expand All @@ -42,6 +45,7 @@ import com.infomaniak.core.legacy.utils.initProgress
import com.infomaniak.core.legacy.utils.setMargins
import com.infomaniak.core.legacy.utils.showProgressCatching
import com.infomaniak.core.legacy.utils.showToast
import kotlinx.coroutines.launch
import okhttp3.MultipartBody

class BugTrackerActivity : AppCompatActivity() {
Expand All @@ -52,7 +56,6 @@ class BugTrackerActivity : AppCompatActivity() {

private val binding: ActivityBugTrackerBinding by lazy { ActivityBugTrackerBinding.inflate(layoutInflater) }
private val bugTrackerViewModel: BugTrackerViewModel by viewModels()
private val gitHubViewModel: GitHubViewModel by viewModels()
private val navigationArgs: BugTrackerActivityArgs by navArgs()

private val fileAdapter = BugTrackerFileAdapter { updateFileTotalSize() }
Expand Down Expand Up @@ -123,8 +126,15 @@ class BugTrackerActivity : AppCompatActivity() {
}

private fun ActivityBugTrackerBinding.checkLastAppVersion() {
gitHubViewModel.getLastRelease(navigationArgs.repoGitHub).observe(this@BugTrackerActivity) { lastRelease ->
appNotUpToDate.isGone = lastRelease?.name == navigationArgs.appBuildNumber
lifecycleScope.launch {
bugTrackerViewModel.mustRequireUpdate(
appId = navigationArgs.appId,
appVersion = navigationArgs.appBuildNumber,
store = AppVersion.Store.PLAY_STORE,
channelFilter = AppVersion.VersionChannel.Internal
).flowWithLifecycle(lifecycle, Lifecycle.State.STARTED).collect { updateRequired ->
appNotUpToDate.isVisible = updateRequired
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,17 @@ package com.infomaniak.core.legacy.bugtracker

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.infomaniak.core.appversionchecker.data.api.ApiRepositoryAppVersion
import com.infomaniak.core.appversionchecker.data.models.AppVersion
import com.infomaniak.core.legacy.networking.HttpClient
import com.infomaniak.core.legacy.networking.HttpUtils
import com.infomaniak.core.legacy.networking.ManualAuthorizationRequired
import com.infomaniak.core.legacy.utils.SingleLiveEvent
import com.infomaniak.core.legacy.utils.await
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.launch
import okhttp3.MediaType.Companion.toMediaTypeOrNull
import okhttp3.MultipartBody
Expand Down Expand Up @@ -67,6 +71,29 @@ class BugTrackerViewModel : ViewModel() {
return isSuccessful
}

fun mustRequireUpdate(
appId: String,
appVersion: String,
store: AppVersion.Store,
channelFilter: AppVersion.VersionChannel,
): Flow<Boolean> = flow {
val projectionFields = listOf(
AppVersion.ProjectionFields.MinVersion,
AppVersion.ProjectionFields.PublishedVersionsTag,
AppVersion.ProjectionFields.PublishedVersionType
)

val apiResponse = ApiRepositoryAppVersion.getAppVersion(
appName = appId,
store = store,
projectionFields = projectionFields,
channelFilter = channelFilter,
okHttpClient = HttpClient.okHttpClientNoTokenInterceptor
)

emit(apiResponse.data?.mustRequireUpdate(appVersion) ?: false)
}

private companion object {
const val REPORT_URL = "https://welcome.infomaniak.com/api/web-components/1/report"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
android:name="userDisplayName"
app:argType="string"
app:nullable="true" />
<argument
android:name="appId"
app:argType="string" />
<argument
android:name="appBuildNumber"
app:argType="string" />
Expand All @@ -48,8 +51,5 @@
<argument
android:name="projectName"
app:argType="string" />
<argument
android:name="repoGitHub"
app:argType="string" />
</activity>
</navigation>
Loading