sync: stabler with safe call operators (fixes #3245) (#3248)

Co-authored-by: dogi <[email protected]>
open-learning-exchange · Mar 14, 2024 · 5abd7d7 · 5abd7d7
1 parent 1d78624
commit 5abd7d7
Show file tree

Hide file tree

Showing 17 changed files with 142 additions and 144 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 1414
-        versionName "0.14.14"
+        versionCode 1415
+        versionName "0.14.15"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

diff --git a/app/src/main/java/org/ole/planet/myplanet/callback/OnHomeItemClickListener.kt b/app/src/main/java/org/ole/planet/myplanet/callback/OnHomeItemClickListener.kt
@@ -5,7 +5,7 @@ import org.ole.planet.myplanet.model.RealmMyLibrary
 import org.ole.planet.myplanet.model.RealmStepExam
 
 interface OnHomeItemClickListener {
-    fun openCallFragment(f: Fragment?)
+    fun openCallFragment(f: Fragment)
     fun openLibraryDetailFragment(library: RealmMyLibrary?)
     fun showRatingDialog(resource: String?, resource_id: String?, title: String?, listener: OnRatingChangeListener?)
 

diff --git a/app/src/main/java/org/ole/planet/myplanet/datamanager/ManagerSync.kt b/app/src/main/java/org/ole/planet/myplanet/datamanager/ManagerSync.kt
@@ -29,7 +29,7 @@ class ManagerSync private constructor(context: Context) {
         mRealm = dbService.realmInstance
     }
 
-    fun login(userName: String, password: String, listener: SyncListener) {
+    fun login(userName: String?, password: String?, listener: SyncListener) {
         listener.onSyncStarted()
         Utilities.log(Utilities.getUrl() + "/org.couchdb.user:" + userName)
         val apiInterface = ApiClient.client?.create(ApiInterface::class.java)

diff --git a/app/src/main/java/org/ole/planet/myplanet/datamanager/Service.kt b/app/src/main/java/org/ole/planet/myplanet/datamanager/Service.kt
@@ -340,7 +340,7 @@ class Service(private val context: Context) {
     }
 
     interface CheckVersionCallback {
-        fun onUpdateAvailable(info: MyPlanet, cancelable: Boolean)
+        fun onUpdateAvailable(info: MyPlanet?, cancelable: Boolean)
         fun onCheckingVersion()
         fun onError(msg: String, blockSync: Boolean)
     }

diff --git a/app/src/main/java/org/ole/planet/myplanet/model/RealmMyTeam.kt b/app/src/main/java/org/ole/planet/myplanet/model/RealmMyTeam.kt
@@ -305,7 +305,7 @@ open class RealmMyTeam : RealmObject() {
         }
 
         @JvmStatic
-        fun getUsers(teamId: String, mRealm: Realm, docType: String): MutableList<RealmUserModel> {
+        fun getUsers(teamId: String?, mRealm: Realm, docType: String): MutableList<RealmUserModel> {
             var query = mRealm.where(RealmMyTeam::class.java).equalTo("teamId", teamId)
             if (docType.isNotEmpty()) {
                 query = query.equalTo("docType", docType)

diff --git a/app/src/main/java/org/ole/planet/myplanet/model/RealmUserModel.kt b/app/src/main/java/org/ole/planet/myplanet/model/RealmUserModel.kt
@@ -174,7 +174,7 @@ open class RealmUserModel : RealmObject() {
 
     companion object {
         @JvmStatic
-        fun createGuestUser(username: String, mRealm: Realm, settings: SharedPreferences): RealmUserModel? {
+        fun createGuestUser(username: String?, mRealm: Realm, settings: SharedPreferences): RealmUserModel? {
             val `object` = JsonObject()
             `object`.addProperty("_id", "guest_$username")
             `object`.addProperty("name", username)

diff --git a/app/src/main/java/org/ole/planet/myplanet/model/User.kt b/app/src/main/java/org/ole/planet/myplanet/model/User.kt
@@ -1,9 +1,9 @@
 package org.ole.planet.myplanet.model
 
 data class User(
-    val fullName: String,
-    val name: String,
-    var password: String,
-    val image: String,
-    var source: String
+    val fullName: String? = null,
+    val name: String? = null,
+    var password: String? = null,
+    val image: String? = null,
+    var source: String? = null
 )
diff --git a/app/src/main/java/org/ole/planet/myplanet/service/AutoSyncWorker.kt b/app/src/main/java/org/ole/planet/myplanet/service/AutoSyncWorker.kt
@@ -82,9 +82,9 @@ class AutoSyncWorker(private val context: Context, workerParams: WorkerParameter
         }
     }
 
-    override fun onUpdateAvailable(info: MyPlanet, cancelable: Boolean) {
+    override fun onUpdateAvailable(info: MyPlanet?, cancelable: Boolean) {
         if (Constants.showBetaFeature(Constants.KEY_AUTOUPDATE, context)) {
-            startDownloadUpdate(context, Utilities.getApkUpdateUrl(info.localapkpath), null)
+            startDownloadUpdate(context, Utilities.getApkUpdateUrl(info?.localapkpath), null)
         }
     }
 

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt
@@ -297,7 +297,7 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, B
         profileDbHandler.onDestory()
     }
 
-    override fun openCallFragment(f: Fragment?) {
+    override fun openCallFragment(f: Fragment) {
         openCallFragment(f, "")
     }
 

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt.lite b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt.lite
@@ -297,7 +297,7 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, B
         profileDbHandler.onDestory()
     }
 
-    override fun openCallFragment(f: Fragment?) {
+    override fun openCallFragment(f: Fragment) {
         openCallFragment(f, "")
     }
 

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/sync/DashboardElementActivity.kt b/app/src/main/java/org/ole/planet/myplanet/ui/sync/DashboardElementActivity.kt
@@ -64,9 +64,9 @@ abstract class DashboardElementActivity : SyncActivity(), FragmentManager.OnBack
         return true
     }
 
-    fun openCallFragment(newfragment: Fragment?, tag: String?) {
+    fun openCallFragment(newfragment: Fragment, tag: String?) {
         val fragmentTransaction = supportFragmentManager.beginTransaction()
-        fragmentTransaction.replace(R.id.fragment_container, newfragment!!, tag)
+        fragmentTransaction.replace(R.id.fragment_container, newfragment, tag)
         supportFragmentManager.addOnBackStackChangedListener(this)
         fragmentTransaction.addToBackStack("")
         fragmentTransaction.commit()
@@ -107,7 +107,7 @@ abstract class DashboardElementActivity : SyncActivity(), FragmentManager.OnBack
         val mWifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI)
         val intent = Intent(Settings.ACTION_WIFI_SETTINGS)
         startActivity(intent)
-        if (mWifi!!.isConnected) {
+        if (mWifi?.isConnected == true) {
             wifi.setWifiEnabled(false)
             if (resIcon != null) {
                 DrawableCompat.setTintMode(resIcon.mutate(), PorterDuff.Mode.SRC_ATOP)
@@ -131,7 +131,7 @@ abstract class DashboardElementActivity : SyncActivity(), FragmentManager.OnBack
         val id = settings.getInt("LastWifiID", -1)
         Utilities.log("LAST SSID $id")
         val wifiManager = applicationContext.getSystemService(WIFI_SERVICE) as WifiManager
-        var netId = -1
+        val netId: Int
         if (wifiManager == null) {
             Utilities.toast(this, getString(R.string.unable_to_connect_to_planet_wifi))
             return

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/sync/LoginActivity.kt b/app/src/main/java/org/ole/planet/myplanet/ui/sync/LoginActivity.kt
@@ -65,7 +65,7 @@ class LoginActivity : SyncActivity(), TeamListAdapter.OnItemClickListener {
         }
         if (intent.hasExtra("versionInfo")) {
             onUpdateAvailable(
-                (intent.getSerializableExtra("versionInfo") as MyPlanet?)!!,
+                (intent.getSerializableExtra("versionInfo") as MyPlanet?),
                 intent.getBooleanExtra("cancelable", false)
             )
         } else {
@@ -98,8 +98,8 @@ class LoginActivity : SyncActivity(), TeamListAdapter.OnItemClickListener {
 
     fun getTeamMembers() {
         selectedTeamId = prefData.getSELECTEDTEAMID().toString()
-        if (selectedTeamId!!.isNotEmpty()) {
-            users = RealmMyTeam.getUsers(selectedTeamId!!, mRealm, "")
+        if (selectedTeamId?.isNotEmpty() == true) {
+            users = RealmMyTeam.getUsers(selectedTeamId, mRealm, "")
             val userList = (users as MutableList<RealmUserModel>?)?.map {
                 User(it.getFullName(), it.name ?: "", "", it.userImage ?: "", "team")
             } ?: emptyList()
@@ -113,7 +113,7 @@ class LoginActivity : SyncActivity(), TeamListAdapter.OnItemClickListener {
         mAdapter = if (mAdapter == null) {
             TeamListAdapter(prefData.getSAVEDUSERS().toMutableList(), this, this)
         } else {
-            mAdapter!!.clearList()
+            mAdapter?.clearList()
             TeamListAdapter(prefData.getSAVEDUSERS().toMutableList(), this, this)
         }
 
@@ -131,7 +131,7 @@ class LoginActivity : SyncActivity(), TeamListAdapter.OnItemClickListener {
     }
 
     override fun onItemClick(user: User) {
-        if (user.password.isEmpty() && user.source != "guest") {
+        if (user.password?.isEmpty() == true && user.source != "guest") {
             Glide.with(this)
                 .load(user.image)
                 .placeholder(R.drawable.profile)

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/sync/ProcessUserDataActivity.kt b/app/src/main/java/org/ole/planet/myplanet/ui/sync/ProcessUserDataActivity.kt
@@ -43,7 +43,7 @@ abstract class ProcessUserDataActivity : PermissionActivity(), SuccessListener {
         override fun onReceive(context: Context, intent: Intent) {
             if (intent.action == DashboardActivity.MESSAGE_PROGRESS && progressDialog != null) {
                 val download = intent.getParcelableExtra<Download>("download")
-                checkDownloadResult(download, progressDialog!!)
+                checkDownloadResult(download, progressDialog)
             }
         }
     }
@@ -59,18 +59,16 @@ abstract class ProcessUserDataActivity : PermissionActivity(), SuccessListener {
         return true
     }
 
-    fun checkDownloadResult(download: Download?, progressDialog: ProgressDialog) {
-        if (!download!!.failed) {
-            progressDialog.setMessage(getString(R.string.downloading) + download.progress + "% " + getString(
-                    R.string.complete
-                ))
+    fun checkDownloadResult(download: Download?, progressDialog: ProgressDialog?) {
+        if (!download?.failed!!) {
+            progressDialog?.setMessage("${getString(R.string.downloading)}${download.progress}% ${getString(R.string.complete)}")
             if (download.completeAll) {
-                progressDialog.dismiss()
-                installApk(this, download.fileUrl!!)
+                progressDialog?.dismiss()
+                installApk(this, download.fileUrl)
             }
         } else {
-            progressDialog.dismiss()
-            showError(progressDialog, download.message!!)
+            progressDialog?.dismiss()
+            showError(progressDialog, download.message)
         }
     }
 
@@ -139,33 +137,33 @@ abstract class ProcessUserDataActivity : PermissionActivity(), SuccessListener {
     }
 
     fun startUpload() {
-        progressDialog!!.setMessage(getString(R.string.uploading_data_to_server_please_wait))
-        progressDialog!!.show()
+        progressDialog?.setMessage(getString(R.string.uploading_data_to_server_please_wait))
+        progressDialog?.show()
         Utilities.log("Upload : upload started")
         UploadToShelfService.instance?.uploadUserData {
-            UploadToShelfService.instance!!.uploadHealth()
+            UploadToShelfService.instance?.uploadHealth()
         }
         UploadManager.instance?.uploadUserActivities(this)
-        UploadManager.instance!!.uploadExamResult(this)
-        UploadManager.instance!!.uploadFeedback(this)
-        UploadManager.instance!!.uploadAchievement()
-        UploadManager.instance!!.uploadResourceActivities("")
-        UploadManager.instance!!.uploadCourseActivities()
-        UploadManager.instance!!.uploadSearchActivity()
-        UploadManager.instance!!.uploadNews()
-        UploadManager.instance!!.uploadTeams()
-        UploadManager.instance!!.uploadResource(this)
-        UploadManager.instance!!.uploadRating(this)
-        UploadManager.instance!!.uploadTeamTask()
-        UploadManager.instance!!.uploadCrashLog(this)
-        UploadManager.instance!!.uploadSubmitPhotos(this)
-        UploadManager.instance!!.uploadActivities(this)
+        UploadManager.instance?.uploadExamResult(this)
+        UploadManager.instance?.uploadFeedback(this)
+        UploadManager.instance?.uploadAchievement()
+        UploadManager.instance?.uploadResourceActivities("")
+        UploadManager.instance?.uploadCourseActivities()
+        UploadManager.instance?.uploadSearchActivity()
+        UploadManager.instance?.uploadNews()
+        UploadManager.instance?.uploadTeams()
+        UploadManager.instance?.uploadResource(this)
+        UploadManager.instance?.uploadRating(this)
+        UploadManager.instance?.uploadTeamTask()
+        UploadManager.instance?.uploadCrashLog(this)
+        UploadManager.instance?.uploadSubmitPhotos(this)
+        UploadManager.instance?.uploadActivities(this)
         Toast.makeText(this, getString(R.string.uploading_activities_to_server_please_wait), Toast.LENGTH_SHORT).show()
     }
 
-    protected fun hideKeyboard(view: View) {
+    protected fun hideKeyboard(view: View?) {
         val `in` = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
-        `in`.hideSoftInputFromWindow(view.windowToken, InputMethodManager.HIDE_NOT_ALWAYS)
+        `in`.hideSoftInputFromWindow(view?.windowToken, InputMethodManager.HIDE_NOT_ALWAYS)
     }
 
     fun saveUserInfoPref(settings: SharedPreferences, password: String?, user: RealmUserModel) {
@@ -177,7 +175,7 @@ abstract class ProcessUserDataActivity : PermissionActivity(), SuccessListener {
         editor.putString("firstName", user.firstName)
         editor.putString("lastName", user.lastName)
         editor.putString("middleName", user.middleName)
-        editor.putBoolean("isUserAdmin", user.userAdmin!!)
+        user.userAdmin?.let { editor.putBoolean("isUserAdmin", it) }
         editor.putLong("lastLogin", System.currentTimeMillis())
         editor.apply()
     }
@@ -193,10 +191,10 @@ abstract class ProcessUserDataActivity : PermissionActivity(), SuccessListener {
 
     private fun getUserInfo(uri: Uri): Array<String> {
         val ar = arrayOf("", "")
-        val info = uri.userInfo!!.split(":".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
-        if (info.size > 1) {
-            ar[0] = info[0]
-            ar[1] = info[1]
+        val info = uri.userInfo?.split(":".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray()
+        if ((info?.size ?: 0) > 1) {
+            ar[0] = "${info?.get(0)}"
+            ar[1] = "${info?.get(1)}"
         }
         return ar
     }