lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix updater

This commit is contained in:
arm64v8a 2021-11-15 23:53:37 +08:00
parent 1a384e7819
commit 87e5cb5211
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TMessagesProj/src/main/java/tw/nekomimi/nekogram/InternalUpdater.java
View File

@ -217,9 +217,8 @@ public class InternalUpdater {
AndroidUtilities.runOnUIThread(() -> {
progressDialog.setProgress(percent);
});
}, (success) -> {
}, () -> {
progressDialog.dismiss();
if (!success) return;
try {
if (NekomuraUtil.calcSHA1(f).equals(sha1)) {

65
TMessagesProj/src/main/java/tw/nekomimi/nkmr/MiniCDNDrive.kt
View File

@ -32,47 +32,48 @@ object MiniCDNDrive {
fun callbackPercent(percent: Int);
}
interface CallbackFinished {
fun callbackFinished(success: Boolean);
}
fun Download(f: File, metaURL: String, callbackPercent: CallbackPercent, callbackFinished: CallbackFinished) {
fun Download(f: File, metaURL: String, callbackPercent: CallbackPercent, callbackFinished: Runnable) {
thread {
try {
var output = FileOutputStream(f, false)
val client = OkHttpClient();
var output = FileOutputStream(f, false)
val client = OkHttpClient();
val request = Request.Builder()
.url(meta2Real(metaURL))
.build()
val response = client.newCall(request).execute()
val data = readPhotoBytes(response.body!!.bytes())
val request = Request.Builder()
.url(meta2Real(metaURL))
.build()
val response = client.newCall(request).execute()
val data = readPhotoBytes(response.body!!.bytes())
val meta = Gson().fromJson(String(data, Charset.forName("UTF-8")), metaJSON::class.java)
val meta = Gson().fromJson(String(data, Charset.forName("UTF-8")), metaJSON::class.java)
var counter = 0
for (block in meta.block) {
val url = block.url.replace("http://", "https://")
var counter = 0
for (block in meta.block) {
lateinit var data2: ByteArray
val try_max = 3
val request2 = Request.Builder()
.url(url)
.build()
val response2 = client.newCall(request2).execute()
val data2 = readPhotoBytes(response2.body!!.bytes())
for (i in 0 until try_max) {
try {
val url = block.url.replace("http://", "https://")
output.write(data2)
//TODO progress
counter++
callbackPercent.callbackPercent((counter * 100.0 / meta.block.size).roundToInt())
val request2 = Request.Builder()
.url(url)
.build()
val response2 = client.newCall(request2).execute()
data2 = readPhotoBytes(response2.body!!.bytes())
} catch (e: Exception) {
if (i == try_max - 1) {
throw e
}
}
}
output.write(data2)
output.close()
callbackFinished.callbackFinished(true)
} catch (e: Exception) {
FileLog.e(e)
callbackFinished.callbackFinished(false)
//TODO progress
counter++
callbackPercent.callbackPercent((counter * 100.0 / meta.block.size).roundToInt())
}
output.close()
callbackFinished.run()
}
}