global: small cleanup

meshenger-app · Jun 14, 2023 · 7520770 · 7520770
1 parent afa664d
commit 7520770
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/app/src/main/kotlin/d/d/meshenger/EventListFragment.kt b/app/src/main/kotlin/d/d/meshenger/EventListFragment.kt
@@ -45,7 +45,7 @@ class EventListFragment : Fragment() {
         }
     }
 
-    private val onEventLongClickListener = AdapterView.OnItemLongClickListener { adapterView, view, i, _ ->
+    private val onEventLongClickListener = AdapterView.OnItemLongClickListener { _, view, i, _ ->
         Log.d(this, "onItemLongClick")
         val activity = requireActivity()
         val binder = (activity as MainActivity).binder ?: return@OnItemLongClickListener false
@@ -153,7 +153,7 @@ class EventListFragment : Fragment() {
         val contacts = binder.getContacts().contactList
 
         activity.runOnUiThread {
-            activity.updateMissedCalls()
+            activity.updateEventTabTitle()
 
             eventListAdapter.update(events, contacts)
             eventListAdapter.notifyDataSetChanged()

diff --git a/app/src/main/kotlin/d/d/meshenger/MainActivity.kt b/app/src/main/kotlin/d/d/meshenger/MainActivity.kt
@@ -146,6 +146,7 @@ class MainActivity : BaseActivity(), ServiceConnection {
 
         val settings = binder!!.getSettings()
 
+        // data source for the views was not ready before
         (viewPager.adapter as ViewPagerFragmentAdapter).let {
             it.ready = true
             it.notifyDataSetChanged()
@@ -186,7 +187,7 @@ class MainActivity : BaseActivity(), ServiceConnection {
         }.attach()
 
         if (!addressWarningShown) {
-            // onyl show once since app start
+            // only show once since app start
             showInvalidAddressSettingsWarning()
             addressWarningShown = true
         }
@@ -264,8 +265,8 @@ class MainActivity : BaseActivity(), ServiceConnection {
         return super.onOptionsItemSelected(item)
     }
 
-    fun updateMissedCalls() {
-        Log.d(this, "updateMissedCalls()")
+    fun updateEventTabTitle() {
+        Log.d(this, "updateEventTabTitle()")
         // update event tab title
         (viewPager.adapter as ViewPagerFragmentAdapter).let {
             it.notifyDataSetChanged()
@@ -276,7 +277,7 @@ class MainActivity : BaseActivity(), ServiceConnection {
         Log.d(this, "onResume()")
         super.onResume()
 
-        updateMissedCalls()
+        updateEventTabTitle()
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {

diff --git a/app/src/main/kotlin/d/d/meshenger/MainService.kt b/app/src/main/kotlin/d/d/meshenger/MainService.kt
@@ -199,6 +199,7 @@ class MainService : Service(), Runnable {
             // ignore
         }
 
+        // save database on exit
         saveDatabase()
         database?.destroy()
 
@@ -253,11 +254,8 @@ class MainService : Service(), Runnable {
     private fun updateNotification() {
         Log.d(this, "updateNotification()")
 
-        //val missedCalls = binder.getEvents().getMissedCalls()
         val eventList = binder.getEvents().eventList
-
         val eventsMissed = binder.getEvents().eventsMissed
-        Log.d(this, "updateNotification() eventsMissed=$eventsMissed")
         val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
         val message = if (eventList.isEmpty() || eventsMissed == 0) {
             // default message

diff --git a/app/src/main/kotlin/d/d/meshenger/SettingsActivity.kt b/app/src/main/kotlin/d/d/meshenger/SettingsActivity.kt
@@ -341,7 +341,6 @@ class SettingsActivity : BaseActivity(), ServiceConnection {
             .show()
     }
 
-
     private fun showChangeConnectRetriesDialog() {
         val settings = binder!!.getSettings()
         val dialog = Dialog(this)

diff --git a/app/src/main/kotlin/d/d/meshenger/call/RTCCall.kt b/app/src/main/kotlin/d/d/meshenger/call/RTCCall.kt
@@ -625,7 +625,6 @@ class RTCCall : RTCPeerConnection {
 
                     if (iceGatheringState == IceGatheringState.COMPLETE) {
                         try {
-                            val settings = binder.getSettings()
                             val ownPublicKey = settings.publicKey
                             val ownSecretKey = settings.secretKey
                             val pw = PacketWriter(commSocket!!)
-Original file line number
+Diff line change
@@ Expand Up @@
                 .show()
         }
         private fun showChangeConnectRetriesDialog() {
             val settings = binder!!.getSettings()
             val dialog = Dialog(this)
@@ Expand Down @@