Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cloud community #4841

Closed
wants to merge 15 commits into from
+430 −138
Closed

Cloud community #4841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8fc81d4
check available url
Okuro3499 Dec 4, 2024
6d3e789
save alternative urls used and process it
Okuro3499 Dec 4, 2024
36b6983
sync to cloud url
Okuro3499 Dec 4, 2024
4551d07
succesful alternative url check
Okuro3499 Dec 5, 2024
b5ac15c
Update DashboardActivity.kt.lite
Okuro3499 Dec 5, 2024
e103e58
add logs
Okuro3499 Dec 17, 2024
795c1bd
cleanup commented code
Okuro3499 Dec 17, 2024
18d71c3
refactor and cleanup
Okuro3499 Dec 17, 2024
d93485a
resolve log error
Okuro3499 Dec 17, 2024
54b08e2
update urls
Okuro3499 Dec 19, 2024
2287202
update urls
Okuro3499 Dec 20, 2024
e00e76f
resolve sync fail caused by protocol
Okuro3499 Jan 6, 2025
3951ea2
resolve alternative url check and sync
Okuro3499 Jan 6, 2025
4119195
cleanup
Okuro3499 Jan 8, 2025
cae3ccd
Merge branch 'master' into cloudCommunityV4
Okuro3499 Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,21 @@ android {
def planetXelaPin = project.findProperty('PLANET_XELA_PIN') ?: ""
def planetUriurUrl = project.findProperty('PLANET_URIUR_URL') ?: ""
def planetUriurPin = project.findProperty('PLANET_URIUR_PIN') ?: ""
def planetUriurCloneUrl = project.findProperty('PLANET_URIUR_CLONE_URL') ?: ""
def planetUriurClonePin = project.findProperty('PLANET_URIUR_CLONE_PIN') ?: ""
def planetRuiruUrl = project.findProperty('PLANET_RUIRU_URL') ?: ""
def planetRuiruPin = project.findProperty('PLANET_RUIRU_PIN') ?: ""
def planetEmbakasiUrl = project.findProperty('PLANET_EMBAKASI_URL') ?: ""
def planetEmbakasiPin = project.findProperty('PLANET_EMBAKASI_PIN') ?: ""
def planetEmbakasiCloneUrl = project.findProperty('PLANET_EMBAKASI_CLONE_URL') ?: ""
def planetEmbakasiClonePin = project.findProperty('PLANET_EMBAKASI_CLONE_PIN') ?: ""
def planetCambridgeUrl = project.findProperty('PLANET_CAMBRIDGE_URL') ?: ""
def planetCambridgePin = project.findProperty('PLANET_CAMBRIDGE_PIN') ?: ""
//def planetEgdirbmacUrl = project.findProperty('PLANET_EGDIRBMAC_URL') ?: ""
//def planetEgdirbmacPin = project.findProperty('PLANET_EGDIRBMAC_PIN') ?: ""
def planetPalmBayUrl = project.findProperty('PLANET_PALMBAY_URL') ?: ""
def planetPalmBayPin = project.findProperty('PLANET_PALMBAY_PIN') ?: ""


buildTypes.each {
it.buildConfigField 'String', 'PLANET_LEARNING_URL', "\"$planetLearningUrl\""
it.buildConfigField 'String', 'PLANET_LEARNING_PIN', "\"${planetLearningPin}\""
Expand All @@ -116,10 +119,14 @@ android {
it.buildConfigField 'String', 'PLANET_XELA_PIN', "\"${planetXelaPin}\""
it.buildConfigField 'String', 'PLANET_URIUR_URL', "\"${planetUriurUrl}\""
it.buildConfigField 'String', 'PLANET_URIUR_PIN', "\"${planetUriurPin}\""
it.buildConfigField 'String', 'PLANET_URIUR_CLONE_URL', "\"${planetUriurCloneUrl}\""
it.buildConfigField 'String', 'PLANET_URIUR_CLONE_PIN', "\"${planetUriurClonePin}\""
it.buildConfigField 'String', 'PLANET_RUIRU_URL', "\"${planetRuiruUrl}\""
it.buildConfigField 'String', 'PLANET_RUIRU_PIN', "\"${planetRuiruPin}\""
it.buildConfigField 'String', 'PLANET_EMBAKASI_URL', "\"${planetEmbakasiUrl}\""
it.buildConfigField 'String', 'PLANET_EMBAKASI_PIN', "\"${planetEmbakasiPin}\""
it.buildConfigField 'String', 'PLANET_EMBAKASI_CLONE_URL', "\"${planetEmbakasiCloneUrl}\""
it.buildConfigField 'String', 'PLANET_EMBAKASI_CLONE_PIN', "\"${planetEmbakasiClonePin}\""
it.buildConfigField 'String', 'PLANET_CAMBRIDGE_URL', "\"${planetCambridgeUrl}\""
it.buildConfigField 'String', 'PLANET_CAMBRIDGE_PIN', "\"${planetCambridgePin}\""
//it.buildConfigField 'String', 'PLANET_EGDIRBMAC_URL', "\"${planetEgdirbmacUrl}\""
Expand Down
206 changes: 128 additions & 78 deletions app/src/main/java/org/ole/planet/myplanet/datamanager/Service.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ import com.google.gson.Gson
import com.google.gson.JsonObject
import io.realm.Realm
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Deferred
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.async
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch
Expand Down Expand Up @@ -40,6 +42,7 @@ import org.ole.planet.myplanet.utilities.JsonUtils
import org.ole.planet.myplanet.utilities.NetworkUtils
import org.ole.planet.myplanet.utilities.NetworkUtils.extractProtocol
import org.ole.planet.myplanet.utilities.NetworkUtils.isNetworkConnectedFlow
import org.ole.planet.myplanet.utilities.ServerUrlMapper
import org.ole.planet.myplanet.utilities.Sha256Utils
import org.ole.planet.myplanet.utilities.Utilities
import org.ole.planet.myplanet.utilities.VersionUtils
Expand Down Expand Up @@ -101,10 +104,13 @@ class Service(private val context: Context) {
}

fun checkVersion(callback: CheckVersionCallback, settings: SharedPreferences) {
if (settings.getString("couchdbURL", "")?.isEmpty() == true) {
callback.onError(context.getString(R.string.config_not_available), true)
return
if (!settings.getBoolean("isAlternativeUrl", false)){
if (settings.getString("couchdbURL", "")?.isEmpty() == true) {
callback.onError(context.getString(R.string.config_not_available), true)
return
}
}

retrofitInterface?.checkVersion(Utilities.getUpdateUrl(settings))?.enqueue(object : Callback<MyPlanet?> {
override fun onResponse(call: Call<MyPlanet?>, response: Response<MyPlanet?>) {
preferences.edit().putInt("LastWifiID", NetworkUtils.getCurrentNetworkId(context)).apply()
Expand Down Expand Up @@ -319,84 +325,127 @@ class Service(private val context: Context) {
}

fun getMinApk(listener: ConfigurationIdListener?, url: String, pin: String, activity: SyncActivity) {
val customProgressDialog = CustomProgressDialog(context).apply {
setText(context.getString(R.string.check_apk_version))
show()
}
val serverUrlMapper = ServerUrlMapper(context)
val mapping = serverUrlMapper.processUrl(url)

retrofitInterface?.getConfiguration("$url/versions")?.enqueue(object : Callback<JsonObject?> {
override fun onResponse(call: Call<JsonObject?>, response: Response<JsonObject?>) {
if (response.isSuccessful) {
response.body()?.let { jsonObject ->
val currentVersion = "${context.resources.getText(R.string.app_version)}"
val minApkVersion = jsonObject.get("minapk").asString
if (isVersionAllowed(currentVersion, minApkVersion)) {
customProgressDialog.setText(context.getString(R.string.checking_server))
val uri = Uri.parse(url)
val couchdbURL: String
if (url.contains("@")) {
getUserInfo(uri)
couchdbURL = url
} else {
val urlUser = "satellite"
couchdbURL = "${uri.scheme}://$urlUser:$pin@${uri.host}:${if (uri.port == -1) if (uri.scheme == "http") 80 else 443 else uri.port}"
}
retrofitInterface.getConfiguration("${getUrl(couchdbURL)}/configurations/_all_docs?include_docs=true").enqueue(object : Callback<JsonObject?> {
override fun onResponse(call: Call<JsonObject?>, response: Response<JsonObject?>) {
if (response.isSuccessful) {
val jsonObjectResponse = response.body()
val rows = jsonObjectResponse?.getAsJsonArray("rows")
if (rows != null && rows.size() > 0) {
val firstRow = rows.get(0).asJsonObject
val id = firstRow.getAsJsonPrimitive("id").asString
val doc = firstRow.getAsJsonObject("doc")
val code = doc.getAsJsonPrimitive("code").asString
listener?.onConfigurationIdReceived(id, code)
activity.setSyncFailed(false)
val urlsToTry = mutableListOf(url)
mapping.alternativeUrl?.let { urlsToTry.add(it) }

MainApplication.applicationScope.launch {
val customProgressDialog = withContext(Dispatchers.Main) {
CustomProgressDialog(context).apply {
setText(context.getString(R.string.check_apk_version))
show()
}
}

try {
val result = withContext(Dispatchers.IO) {
val deferredResults = urlsToTry.map { currentUrl ->
async {
try {
val versionsResponse =
try {
val response = retrofitInterface?.getConfiguration("$currentUrl/versions")?.execute()
response
} catch (e: java.net.ConnectException) {
e.printStackTrace()
null
} catch (e: java.net.SocketTimeoutException) {
e.printStackTrace()
null
} catch (e: Exception) {
e.printStackTrace()
null
}

if (versionsResponse?.isSuccessful == true) {
val jsonObject = versionsResponse.body()
val currentVersion = "${context.resources.getText(R.string.app_version)}"
val minApkVersion = jsonObject?.get("minapk")?.asString

if (minApkVersion != null && isVersionAllowed(currentVersion, minApkVersion)) {
val uri = Uri.parse(currentUrl)
val couchdbURL = if (currentUrl.contains("@")) {
getUserInfo(uri)
currentUrl
} else {
activity.setSyncFailed(true)
showAlertDialog(context.getString(R.string.failed_to_get_configuration_id), false)
val urlUser = "satellite"
"${uri.scheme}://$urlUser:$pin@${uri.host}:${if (uri.port == -1) if (uri.scheme == "http") 80 else 443 else uri.port}"
}
} else {
activity.setSyncFailed(true)
showAlertDialog(context.getString(R.string.failed_to_get_configuration_id), false)
}
customProgressDialog.dismiss()
}

override fun onFailure(call: Call<JsonObject?>, t: Throwable) {
activity.setSyncFailed(true)
customProgressDialog.dismiss()
if (getUrl(couchdbURL) == context.getString(R.string.http_protocol)) {
showAlertDialog(context.getString(R.string.device_couldn_t_reach_local_server), false)
} else if (getUrl(couchdbURL) == context.getString(R.string.https_protocol)) {
showAlertDialog(context.getString(R.string.device_couldn_t_reach_nation_server), false)
withContext(Dispatchers.Main) {
customProgressDialog.setText(context.getString(R.string.checking_server))
}

val configResponse = retrofitInterface?.getConfiguration("${getUrl(couchdbURL)}/configurations/_all_docs?include_docs=true")?.execute()

if (configResponse?.isSuccessful == true) {
val rows = configResponse.body()?.getAsJsonArray("rows")
if (rows != null && rows.size() > 0) {
val firstRow = rows.get(0).asJsonObject
val id = firstRow.getAsJsonPrimitive("id").asString
val doc = firstRow.getAsJsonObject("doc")
val code = doc.getAsJsonPrimitive("code").asString
return@async UrlCheckResult.Success(id, code, currentUrl)
}
}
}
}
})
} else {
activity.setSyncFailed(true)
customProgressDialog.dismiss()
showAlertDialog(context.getString(R.string.below_min_apk), true)
return@async UrlCheckResult.Failure(currentUrl)
} catch (e: Exception) {
e.printStackTrace()
return@async UrlCheckResult.Failure(currentUrl)
}
}
}
} else {
activity.setSyncFailed(true)
customProgressDialog.dismiss()
showAlertDialog(context.getString(R.string.device_couldn_t_reach_local_server), false)
val result = deferredResults.awaitFirst { it is UrlCheckResult.Success }
result
}
}

override fun onFailure(call: Call<JsonObject?>, t: Throwable) {
when (result) {
is UrlCheckResult.Success -> {
val isAlternativeUrl = result.url != url
listener?.onConfigurationIdReceived(result.id, result.code, result.url, isAlternativeUrl)
activity.setSyncFailed(false)
}
is UrlCheckResult.Failure -> {
activity.setSyncFailed(true)
val errorMessage = when (extractProtocol(url)) {
context.getString(R.string.http_protocol) -> context.getString(R.string.device_couldn_t_reach_local_server)
context.getString(R.string.https_protocol) -> context.getString(R.string.device_couldn_t_reach_nation_server)
else -> context.getString(R.string.device_couldn_t_reach_local_server)
}
showAlertDialog(errorMessage, false)
}
}
} catch (e: Exception) {
e.printStackTrace()
activity.setSyncFailed(true)
customProgressDialog.dismiss()
if (extractProtocol(url) == context.getString(R.string.http_protocol)) {
withContext(Dispatchers.Main) {
showAlertDialog(context.getString(R.string.device_couldn_t_reach_local_server), false)
} else if (extractProtocol(url) == context.getString(R.string.https_protocol)) {
showAlertDialog(context.getString(R.string.device_couldn_t_reach_nation_server), false)
}
} finally {
customProgressDialog.dismiss()
}
})
}
}

sealed class UrlCheckResult {
data class Success(val id: String, val code: String, val url: String) : UrlCheckResult()
data class Failure(val url: String) : UrlCheckResult()
}

private suspend fun <T> List<Deferred<T>>.awaitFirst(predicate: (T) -> Boolean): T {
return firstOrNull { job ->
try {
val result = job.await()
predicate(result)
} catch (e: Exception) {
e.printStackTrace()
false
}
}?.await() ?: throw NoSuchElementException("No matching result found")
}

private fun isVersionAllowed(currentVersion: String, minApkVersion: String): Boolean {
Expand All @@ -416,18 +465,19 @@ class Service(private val context: Context) {
}

fun showAlertDialog(message: String?, playStoreRedirect: Boolean) {
val builder = AlertDialog.Builder(context, R.style.CustomAlertDialog)
builder.setMessage(message)
builder.setCancelable(true)
builder.setNegativeButton(R.string.okay) {
dialog: DialogInterface, _: Int ->
if (playStoreRedirect) {
Utilities.openPlayStore()
MainApplication.applicationScope.launch(Dispatchers.Main) {
val builder = AlertDialog.Builder(context, R.style.CustomAlertDialog)
builder.setMessage(message)
builder.setCancelable(true)
builder.setNegativeButton(R.string.okay) { dialog: DialogInterface, _: Int ->
if (playStoreRedirect) {
Utilities.openPlayStore()
}
dialog.cancel()
}
dialog.cancel()
val alert = builder.create()
alert.show()
}
val alert = builder.create()
alert.show()
}

private fun getUrl(couchdbURL: String): String {
Expand Down Expand Up @@ -470,6 +520,6 @@ class Service(private val context: Context) {
}

interface ConfigurationIdListener {
fun onConfigurationIdReceived(id: String, code: String)
fun onConfigurationIdReceived(id: String, code: String, url: String, isAlternativeUrl: Boolean)
}
}
6 changes: 3 additions & 3 deletions app/src/main/java/org/ole/planet/myplanet/service/TransactionSyncManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ object TransactionSyncManager {
fun authenticate(): Boolean {
val apiInterface = client?.create(ApiInterface::class.java)
try {
val response: Response<DocumentResponse>? = apiInterface?.getDocuments(Utilities.header, Utilities.getUrl() + "/tablet_users/_all_docs")?.execute()
val response: Response<DocumentResponse>? = apiInterface?.getDocuments(Utilities.header, "${Utilities.getUrl()}/tablet_users/_all_docs")?.execute()
if (response != null) {
return response.code() == 200
}
Expand All @@ -64,7 +64,7 @@ object TransactionSyncManager {
listener.onSyncStarted()
val userName = settings.getString("loginUserName", "")
val password = settings.getString("loginUserPassword", "")
val header = "Basic " + Base64.encodeToString("$userName:$password".toByteArray(), Base64.NO_WRAP)
val header = "Basic ${Base64.encodeToString("$userName:$password".toByteArray(), Base64.NO_WRAP)}"
mRealm.executeTransactionAsync({ realm: Realm ->
val users = realm.where(RealmUserModel::class.java).isNotEmpty("_id").findAll()
for (userModel in users) {
Expand All @@ -76,7 +76,7 @@ object TransactionSyncManager {
}

private fun syncHealthData(userModel: RealmUserModel?, header: String) {
val table = "userdb-" + userModel?.planetCode?.let { Utilities.toHex(it) } + "-" + userModel?.name?.let { Utilities.toHex(it) }
val table = "userdb-${userModel?.planetCode?.let { Utilities.toHex(it) }}-${userModel?.name?.let { Utilities.toHex(it) }}"
val apiInterface = client?.create(ApiInterface::class.java)
val response: Response<DocumentResponse>?
try {
Expand Down
Loading
Loading