add min app version field

Android-Boot-Manager · Aug 1, 2024 · fa24a61 · fa24a61
1 parent 36f0211
commit fa24a61
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/app/src/main/java/org/andbootmgr/app/CreatePartFlow.kt b/app/src/main/java/org/andbootmgr/app/CreatePartFlow.kt
@@ -357,7 +357,10 @@ private fun Shop(c: CreatePartDataHolder) {
 					} catch (e: FileNotFoundException) {
 						URL("https://raw.githubusercontent.com/Android-Boot-Manager/ABM-json/master/devices/" + c.vm.codename + ".json").readText()
 					}
-					json = JSONTokener(jsonText).nextValue() as JSONObject
+					val jjson = JSONTokener(jsonText).nextValue() as JSONObject
+					if (BuildConfig.VERSION_CODE < jjson.getInt("minAppVersion"))
+						throw IllegalStateException("please upgrade app")
+					json = jjson
 					//Log.i("ABM shop:", jsonText)
 				} catch (e: Exception) {
 					Log.e("ABM shop", Log.getStackTraceString(e))

diff --git a/app/src/main/java/org/andbootmgr/app/DeviceInfo.kt b/app/src/main/java/org/andbootmgr/app/DeviceInfo.kt
@@ -95,6 +95,8 @@ class JsonDeviceInfoFactory(private val ctx: Context) {
 			}
 			val jsonRoot = JSONTokener(jsonText).nextValue() as JSONObject? ?: return null
 			val json = jsonRoot.getJSONObject("deviceInfo")
+			if (BuildConfig.VERSION_CODE < json.getInt("minAppVersion"))
+				throw IllegalStateException("please upgrade app")
 			if (fromNet) {
 				val newRoot = JSONObject()
 				newRoot.put("deviceInfo", json)

diff --git a/app/src/main/java/org/andbootmgr/app/DroidBootFlow.kt b/app/src/main/java/org/andbootmgr/app/DroidBootFlow.kt
@@ -148,6 +148,8 @@ fun SelectDroidBoot(vm: WizardActivityState) {
 						val jsonText =
 							URL("https://raw.githubusercontent.com/Android-Boot-Manager/ABM-json/master/devices/" + vm.codename + ".json").readText()
 						val json = JSONTokener(jsonText).nextValue() as JSONObject
+						if (BuildConfig.VERSION_CODE < json.getInt("minAppVersion"))
+							throw IllegalStateException("please upgrade app")
 						val bl = json.getJSONObject("bootloader")
 						val url = bl.getString("url")
 						val sha = if (bl.has("sha256")) bl.getString("sha256") else null
@@ -197,6 +199,8 @@ fun SelectInstallSh(vm: WizardActivityState) {
 						val jsonText =
 							URL("https://raw.githubusercontent.com/Android-Boot-Manager/ABM-json/master/devices/" + vm.codename + ".json").readText()
 						val json = JSONTokener(jsonText).nextValue() as JSONObject
+						if (BuildConfig.VERSION_CODE < json.getInt("minAppVersion"))
+							throw IllegalStateException("please upgrade app")
 						val i = json.getJSONObject("installScript")
 						val url = i.getString("url")
 						val sha = if (i.has("sha256")) i.getString("sha256") else null