-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11 from Fmaldonado6/development
Development
- Loading branch information
Showing
21 changed files
with
429 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
mobile_app/app/src/main/java/com/fmaldonado/akiyama/data/models/version/GithubVersion.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package com.fmaldonado.akiyama.data.models.version | ||
|
|
||
| data class GithubVersion( | ||
| val tag_name: String, | ||
| val name: String, | ||
| val prerelease: Boolean, | ||
| val assets: List<GithubAsset> | ||
| ) | ||
|
|
||
| data class GithubAsset( | ||
| val name: String, | ||
| val browser_download_url: String | ||
| ) |
9 changes: 9 additions & 0 deletions
9
mobile_app/app/src/main/java/com/fmaldonado/akiyama/data/network/LatestVersionDataSource.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package com.fmaldonado.akiyama.data.network | ||
|
|
||
| import com.fmaldonado.akiyama.data.models.version.GithubVersion | ||
| import retrofit2.http.GET | ||
|
|
||
| interface LatestVersionDataSource { | ||
| @GET("latest") | ||
| suspend fun getLatestRelease(): GithubVersion | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,4 +24,4 @@ class NetworkInterceptor : Interceptor { | |
| throw AppError(response.body()) | ||
|
|
||
| } | ||
| } | ||
| } | ||
66 changes: 66 additions & 0 deletions
66
...p/app/src/main/java/com/fmaldonado/akiyama/data/repositories/updater/UpdaterRepository.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| package com.fmaldonado.akiyama.data.repositories.updater | ||
|
|
||
|
|
||
| import androidx.lifecycle.MutableLiveData | ||
| import com.fmaldonado.akiyama.AkiyamaApplication | ||
| import com.fmaldonado.akiyama.BuildConfig | ||
| import com.fmaldonado.akiyama.data.models.version.GithubVersion | ||
| import com.fmaldonado.akiyama.data.network.LatestVersionDataSource | ||
| import com.fmaldonado.akiyama.ui.common.UpdateEvents | ||
| import com.fmaldonado.akiyama.ui.common.UpdateStatus | ||
| import kotlinx.coroutines.delay | ||
| import okhttp3.OkHttpClient | ||
| import okhttp3.Request | ||
| import ru.gildor.coroutines.okhttp.await | ||
| import java.io.File | ||
| import javax.inject.Inject | ||
| import javax.inject.Singleton | ||
|
|
||
| @Singleton | ||
| class UpdaterRepository | ||
| @Inject | ||
| constructor( | ||
| private val latestVersionDataSource: LatestVersionDataSource, | ||
| private val okHttpClient: OkHttpClient, | ||
| private val application: AkiyamaApplication | ||
| ) { | ||
|
|
||
| val hasNewVersion = MutableLiveData<UpdateEvents>() | ||
| val newVersionUri = MutableLiveData<File>() | ||
| private var version: GithubVersion? = null | ||
|
|
||
| suspend fun lookForNewVersion(manualClick: Boolean) { | ||
| if (manualClick) { | ||
| hasNewVersion.postValue(UpdateEvents(UpdateStatus.Looking, manualClick)) | ||
| delay(1000) | ||
| } | ||
| version = latestVersionDataSource.getLatestRelease() | ||
| version?.let { | ||
| if (it.prerelease) | ||
| return | ||
| val status = if (it.tag_name != BuildConfig.VERSION_NAME && !BuildConfig.DEBUG) | ||
| UpdateStatus.NewUpdate | ||
| else | ||
| UpdateStatus.Updated | ||
| hasNewVersion.postValue( | ||
| UpdateEvents( | ||
| status, | ||
| manualClick | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| suspend fun downloadLatest() { | ||
| version?.let { | ||
| val asset = it.assets.firstOrNull() ?: throw Exception() | ||
| val req = Request.Builder().url(asset.browser_download_url).build() | ||
| val res = okHttpClient.newCall(req).await() | ||
| val bytes = res.body()?.byteStream() ?: throw Exception() | ||
| val file = File(application.externalCacheDir, "update.apk") | ||
| bytes.copyTo(file.outputStream()) | ||
| newVersionUri.postValue(file) | ||
| } | ||
| } | ||
|
|
||
| } |
42 changes: 42 additions & 0 deletions
42
mobile_app/app/src/main/java/com/fmaldonado/akiyama/data/utils/ApkInstaller.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| package com.fmaldonado.akiyama.data.utils | ||
|
|
||
| import android.content.ActivityNotFoundException | ||
| import android.content.Context | ||
| import android.content.Intent | ||
| import android.net.Uri | ||
| import android.os.Build | ||
| import android.util.Log | ||
| import androidx.core.content.FileProvider | ||
| import com.fmaldonado.akiyama.BuildConfig | ||
| import java.io.File | ||
|
|
||
|
|
||
| object ApkInstaller { | ||
| fun installApplication(context: Context, file: File) { | ||
| val intent = Intent(Intent.ACTION_VIEW) | ||
| intent.setDataAndType( | ||
| uriFromFile(context, file), | ||
| "application/vnd.android.package-archive" | ||
| ) | ||
| intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) | ||
| intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) | ||
| try { | ||
| context.startActivity(intent) | ||
| } catch (e: ActivityNotFoundException) { | ||
| e.printStackTrace() | ||
| Log.e("TAG", "Error in opening the file!") | ||
| } | ||
| } | ||
|
|
||
| private fun uriFromFile(context: Context, file: File): Uri? { | ||
| return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { | ||
| FileProvider.getUriForFile( | ||
| context, | ||
| BuildConfig.APPLICATION_ID + ".provider", | ||
| file | ||
| ) | ||
| } else { | ||
| Uri.fromFile(file) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
..._app/app/src/main/java/com/fmaldonado/akiyama/ui/activities/main/MainActivityViewModel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package com.fmaldonado.akiyama.ui.activities.main | ||
|
|
||
| import android.util.Log | ||
| import androidx.lifecycle.ViewModel | ||
| import androidx.lifecycle.viewModelScope | ||
| import com.fmaldonado.akiyama.data.repositories.updater.UpdaterRepository | ||
| import com.fmaldonado.akiyama.ui.common.UpdateEvents | ||
| import com.fmaldonado.akiyama.ui.common.UpdateStatus | ||
| import dagger.hilt.android.lifecycle.HiltViewModel | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.launch | ||
| import java.lang.Exception | ||
| import javax.inject.Inject | ||
|
|
||
| @HiltViewModel | ||
| class MainActivityViewModel | ||
| @Inject | ||
| constructor( | ||
| private val updaterRepository: UpdaterRepository | ||
| ) : ViewModel() { | ||
|
|
||
| val hasNewVersion = updaterRepository.hasNewVersion | ||
| fun checkLatestVersion(manual: Boolean = false) { | ||
| viewModelScope.launch(Dispatchers.IO) { | ||
| try { | ||
| updaterRepository.lookForNewVersion(manual) | ||
| } catch (e: Exception) { | ||
| updaterRepository.hasNewVersion.postValue(UpdateEvents(UpdateStatus.Error, manual)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.