The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2025-01-11 00:29:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make checking latest build its own function

Browse Source
This commit is contained in:
PabloG02 2023-01-21 20:03:16 +01:00
parent b6c1647476
commit 19c4bf0aeb
2 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
app/src/main/java/emu/skyline/AppUpdater.kt
View File

@ -27,6 +27,7 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import org.json.JSONArray
import org.json.JSONObject
import org.json.JSONTokener
import java.io.File
import java.io.IOException
@ -81,28 +82,18 @@ class AppUpdater : BroadcastReceiver() {
val myHandler = Handler(Looper.getMainLooper())
val builder = AlertDialog.Builder(applicationContext)
val url = URL("$baseUrl/builds")
CoroutineScope(Dispatchers.IO).launch {
try {
val response = url.readText()
val jsonBuilds = JSONTokener(response).nextValue() as JSONArray
var ftx1Index = 0
while (ftx1Index < jsonBuilds.length() && jsonBuilds.getJSONObject(ftx1Index).get("branch") != branch) {
ftx1Index++
}
if (ftx1Index >= jsonBuilds.length())
ftx1Index = 0
val remoteBuildGitHash = jsonBuilds.getJSONObject(ftx1Index).getJSONObject("commit").getString("id")
val newestBuild = checkRemoteForUpdates()
if (newestBuild != null) {
val remoteBuildGitHash = newestBuild.getJSONObject("commit").getString("id")
if (BuildConfig.GIT_HASH != remoteBuildGitHash) {
val id = jsonBuilds.getJSONObject(ftx1Index).get("id")
val apkName = jsonBuilds.getJSONObject(ftx1Index).get("apkName")
val id = newestBuild.get("id")
val apkName = newestBuild.get("apkName")
val uri = Uri.parse("$baseUrl/cache/${id}/${apkName}")
myHandler.post {
builder.setTitle("New version ${jsonBuilds.getJSONObject(ftx1Index).get("runNumber")}")
.setMessage(Html.fromHtml("<b>Changelog</b><p>${jsonBuilds.getJSONObject(ftx1Index).getJSONObject("commit").getString("message")}</p>", 0))
builder.setTitle("New version ${newestBuild.get("runNumber")}")
.setMessage(Html.fromHtml("<b>Changelog</b><p>${newestBuild.getJSONObject("commit").getString("message")}</p>", 0))
.setCancelable(true)
.setPositiveButton("Update") { dialogInterface, _ ->
val receiver = AppUpdater()
@ -114,37 +105,25 @@ class AppUpdater : BroadcastReceiver() {
} else {
myHandler.post {
builder.setTitle("No updates available")
.setMessage(Html.fromHtml("<b>Changelog</b><p>${jsonBuilds.getJSONObject(ftx1Index).getJSONObject("commit").getString("message")}</p>", 0))
.setMessage(Html.fromHtml("<b>Changelog</b><p>${newestBuild.getJSONObject("commit").getString("message")}</p>", 0))
.setCancelable(true)
.setPositiveButton("Close") { dialogInterface, _ ->
dialogInterface.dismiss()
}.show()
}
}
} catch (e : IOException) {
e.printStackTrace()
}
}
}
@JvmStatic
@com.google.android.material.badge.ExperimentalBadgeUtils
fun checkForUpdates2(context : Context, icon: ImageView) {
fun notifyUpdateBadge(context : Context, icon : ImageView) {
CoroutineScope(Dispatchers.IO).launch {
val url = URL("$baseUrl/builds")
try {
val response = url.readText()
val jsonBuilds = JSONTokener(response).nextValue() as JSONArray
var ftx1Index = 0
while (ftx1Index < jsonBuilds.length() && jsonBuilds.getJSONObject(ftx1Index).get("branch") != branch) {
ftx1Index++
}
if (ftx1Index >= jsonBuilds.length())
ftx1Index = 0
val remoteBuildGitHash = jsonBuilds.getJSONObject(ftx1Index).getJSONObject("commit").getString("id")
if(BuildConfig.GIT_HASH != remoteBuildGitHash){
val newestBuild = checkRemoteForUpdates()
if (newestBuild != null) {
val remoteBuildGitHash = newestBuild.getJSONObject("commit").getString("id")
if (BuildConfig.GIT_HASH != remoteBuildGitHash) {
val badge = BadgeDrawable.create(context)
badge.badgeGravity = BOTTOM_END
badge.verticalOffset = 25
@ -152,10 +131,29 @@ class AppUpdater : BroadcastReceiver() {
badge.backgroundColor = ContextCompat.getColor(context, R.color.colorPrimary)
BadgeUtils.attachBadgeDrawable(badge, icon)
}
} catch (e : IOException) {
e.printStackTrace()
}
}
}
@JvmStatic
fun checkRemoteForUpdates() : JSONObject? {
val url = URL("$baseUrl/builds")
try {
val response = url.readText()
val jsonBuilds = JSONTokener(response).nextValue() as JSONArray
var ftx1Index = 0
while (ftx1Index < jsonBuilds.length() && jsonBuilds.getJSONObject(ftx1Index).get("branch") != branch) {
ftx1Index++
}
if (ftx1Index >= jsonBuilds.length())
ftx1Index = 0
return jsonBuilds.getJSONObject(ftx1Index)
} catch (e : IOException) {
e.printStackTrace()
return null
}
}
}
}

2
app/src/main/java/emu/skyline/MainActivity.kt
View File

@ -154,7 +154,7 @@ class MainActivity : AppCompatActivity() {
if (BuildConfig.FLAVOR == "edge") {
binding.checkUpdatesIcon.visibility = View.GONE
} else {
AppUpdater.checkForUpdates2(context, binding.checkUpdatesIcon)
AppUpdater.notifyUpdateBadge(context, binding.checkUpdatesIcon)
binding.checkUpdatesIcon.setOnClickListener {
AppUpdater.checkForUpdates(context)
}