Skip to content
This repository has been archived by the owner on Aug 31, 2023. It is now read-only.
/ AmazWare Public archive

Commit

Permalink
Extras empty fields new warning added
Browse files Browse the repository at this point in the history
  • Loading branch information
@Keddnyo
Keddnyo committed Mar 8, 2022
1 parent 4b3b78f commit b493487
Show file tree
Hide file tree
Showing 4 changed files with 114 additions and 100 deletions.
4 changes: 1 addition & 3 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ android {
minSdk 21
targetSdk 32
versionCode 1
versionName "1.1.0"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
versionName "1.2.0"
}

buildTypes {
Expand Down
208 changes: 111 additions & 97 deletions app/src/main/java/io/github/keddnyo/amazware/activities/ExtrasDialog.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class ExtrasDialog : AppCompatActivity() {
val buttonImport = findViewById<Button>(R.id.buttonImport)
val buttonSubmit = findViewById<Button>(R.id.buttonSubmit)
val progressBar = findViewById<LinearLayout>(R.id.progressBar)
val error = getString(R.string.firmware_empty_field)

val devList = ArrayList<String>()
val devAdapter =
Expand Down Expand Up @@ -171,111 +172,124 @@ class ExtrasDialog : AppCompatActivity() {
deviceSpinner.adapter = devAdapter

buttonSubmit.setOnClickListener {
progressBar.post {
progressBar.visibility = View.VISIBLE
}

// Init serverRequest val here because we're communicate with EditText
val serverRequest =
MakeRequest().directDevice(
productionSource.text.toString(),
deviceSource.text.toString(),
appVersion.text.toString(),
appName.selectedItem.toString()
)

okHttpClient.newCall(serverRequest).enqueue(object : Callback {
override fun onFailure(call: Call, e: IOException) {
when {
productionSource.text.isEmpty() -> {
productionSource.error = error
}
deviceSource.text.isEmpty() -> {
deviceSource.error = error
}
appVersion.text.isEmpty() -> {
appVersion.error = error
}
else -> {
progressBar.post {
progressBar.visibility = View.GONE
Toast.makeText(
this@ExtrasDialog,
getString(R.string.failed),
Toast.LENGTH_SHORT
).show()
progressBar.visibility = View.VISIBLE
}
}

override fun onResponse(call: Call, response: Response) {
val json = JSONObject(response.body()!!.string())
// Init serverRequest val here because we're communicate with EditText
val serverRequest =
MakeRequest().directDevice(
productionSource.text.toString(),
deviceSource.text.toString(),
appVersion.text.toString(),
appName.selectedItem.toString()
)

okHttpClient.newCall(serverRequest).enqueue(object : Callback {
override fun onFailure(call: Call, e: IOException) {
progressBar.post {
progressBar.visibility = View.GONE
Toast.makeText(
this@ExtrasDialog,
getString(R.string.failed),
Toast.LENGTH_SHORT
).show()
}
}

intent.putExtra("json", json.toString())
override fun onResponse(call: Call, response: Response) {
val json = JSONObject(response.body()!!.string())

if (json.has("firmwareVersion")) {
val firmwareVersion =
json.getString("firmwareVersion") // Firmware
val firmwareMd5 = json.getString("firmwareMd5") // Firmware MD5
val firmwareUrl = json.getString("firmwareUrl")
intent.putExtra("json", json.toString())

intent.putExtra("firmwareVersion", firmwareVersion)
intent.putExtra("firmwareMd5", firmwareMd5)
intent.putExtra("firmwareUrl", firmwareUrl)
}
if (json.has("resourceVersion")) {
val resourceVersion =
json.getString("resourceVersion") // Resources
val resourceMd5 = json.getString("resourceMd5") // Resources MD5
val resourceUrl = json.getString("resourceUrl")

intent.putExtra("resourceVersion", resourceVersion)
intent.putExtra("resourceMd5", resourceMd5)
intent.putExtra("resourceUrl", resourceUrl)
}
if (json.has("baseResourceVersion")) {
val baseResourceVersion =
json.getString("baseResourceVersion") // Base resources
val baseResourceMd5 =
json.getString("baseResourceMd5") // Base resources MD5
val baseResourceUrl = json.getString("baseResourceUrl")

intent.putExtra("baseResourceVersion", baseResourceVersion)
intent.putExtra("baseResourceMd5", baseResourceMd5)
intent.putExtra("baseResourceUrl", baseResourceUrl)
}
if (json.has("fontVersion")) {
val fontVersion = json.getString("fontVersion") // Font
val fontMd5 = json.getString("fontMd5") // Font MD5
val fontUrl = json.getString("fontUrl")

intent.putExtra("fontVersion", fontVersion)
intent.putExtra("fontMd5", fontMd5)
intent.putExtra("fontUrl", fontUrl)
}
if (json.has("gpsVersion")) {
val gpsVersion = json.getString("gpsVersion") // gpsVersion
val gpsMd5 = json.getString("gpsMd5") // gpsVersion
val gpsUrl = json.getString("gpsUrl")

intent.putExtra("gpsVersion", gpsVersion)
intent.putExtra("gpsMd5", gpsMd5)
intent.putExtra("gpsUrl", gpsUrl)
}
if (json.has("lang")) {
val lang = json.getString("lang") // Languages
intent.putExtra("lang", lang)
}
if (json.has("changeLog")) {
val changelog = json.getString("changeLog") // changeLog
intent.putExtra("changelog", changelog)
}
if (!json.has("firmwareVersion")) {
runOnUiThread {
Toast.makeText(
context,
getString(R.string.firmware_not_found),
Toast.LENGTH_SHORT
).show()
}
} else {
finish()
startActivity(intent)
}
if (json.has("firmwareVersion")) {
val firmwareVersion =
json.getString("firmwareVersion") // Firmware
val firmwareMd5 = json.getString("firmwareMd5") // Firmware MD5
val firmwareUrl = json.getString("firmwareUrl")

progressBar.post {
progressBar.visibility = View.GONE
}
intent.putExtra("firmwareVersion", firmwareVersion)
intent.putExtra("firmwareMd5", firmwareMd5)
intent.putExtra("firmwareUrl", firmwareUrl)
}
if (json.has("resourceVersion")) {
val resourceVersion =
json.getString("resourceVersion") // Resources
val resourceMd5 = json.getString("resourceMd5") // Resources MD5
val resourceUrl = json.getString("resourceUrl")

intent.putExtra("resourceVersion", resourceVersion)
intent.putExtra("resourceMd5", resourceMd5)
intent.putExtra("resourceUrl", resourceUrl)
}
if (json.has("baseResourceVersion")) {
val baseResourceVersion =
json.getString("baseResourceVersion") // Base resources
val baseResourceMd5 =
json.getString("baseResourceMd5") // Base resources MD5
val baseResourceUrl = json.getString("baseResourceUrl")

intent.putExtra("baseResourceVersion", baseResourceVersion)
intent.putExtra("baseResourceMd5", baseResourceMd5)
intent.putExtra("baseResourceUrl", baseResourceUrl)
}
if (json.has("fontVersion")) {
val fontVersion = json.getString("fontVersion") // Font
val fontMd5 = json.getString("fontMd5") // Font MD5
val fontUrl = json.getString("fontUrl")

intent.putExtra("fontVersion", fontVersion)
intent.putExtra("fontMd5", fontMd5)
intent.putExtra("fontUrl", fontUrl)
}
if (json.has("gpsVersion")) {
val gpsVersion = json.getString("gpsVersion") // gpsVersion
val gpsMd5 = json.getString("gpsMd5") // gpsVersion
val gpsUrl = json.getString("gpsUrl")

intent.putExtra("gpsVersion", gpsVersion)
intent.putExtra("gpsMd5", gpsMd5)
intent.putExtra("gpsUrl", gpsUrl)
}
if (json.has("lang")) {
val lang = json.getString("lang") // Languages
intent.putExtra("lang", lang)
}
if (json.has("changeLog")) {
val changelog = json.getString("changeLog") // changeLog
intent.putExtra("changelog", changelog)
}
if (!json.has("firmwareVersion")) {
runOnUiThread {
Toast.makeText(
context,
getString(R.string.firmware_not_found),
Toast.LENGTH_SHORT
).show()
}
} else {
finish()
startActivity(intent)
}

progressBar.post {
progressBar.visibility = View.GONE
}
}
})
}
})
}
}

buttonImport.setOnClickListener {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-ru-rRU/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<string name="firmware_lang">Языки</string>
<string name="firmware_change_log">Список изменений</string>
<string name="firmware_date">Дата</string>
<string name="firmware_empty_field">Поле не должно быть пустым</string>
<string name="firmware_not_found">Прошивка не найдена</string>
<string name="none">Нет</string>

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<string name="firmware_lang">Languages</string>
<string name="firmware_change_log">Changelog</string>
<string name="firmware_date">Date</string>
<string name="firmware_empty_field">The field must not be empty</string>
<string name="firmware_not_found">Firmware not found</string>
<string name="none">None</string>

Expand Down

0 comments on commit b493487

Please sign in to comment.