fix : amqp client crash and add : anti-screenshot support,

- amqp is fixed with some occasional caught errors whilst config changes
- Screenshot is disabled for MainActivity
- some code refactoring.

Author: sarafanshul

app/src/main/java/com/projectdelta/zoro/ZoroApplication.kt

@@ -29,7 +29,7 @@ class ZoroApplication : Application() ,Configuration.Provider {
 
         if (BuildConfig.DEBUG) {
             Timber.plant(CustomDebugTree())
-//            setupStrictMode()
+            setupStrictMode()
         }
 
     }

app/src/main/java/com/projectdelta/zoro/ui/base/BaseActivity.kt

@@ -5,6 +5,7 @@
 package com.projectdelta.zoro.ui.base
 
 import android.os.Bundle
+import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import com.projectdelta.zoro.data.preferences.PreferencesManager
 import com.projectdelta.zoro.di.NetworkModule
@@ -49,4 +50,11 @@ abstract class BaseActivity : AppCompatActivity() {
         super.onDestroy()
     }
 
+    /**
+     * Sets secure flag (mostly prevents screenshots)
+     */
+    protected fun setSecureMode(){
+        window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
+    }
+
 }

app/src/main/java/com/projectdelta/zoro/ui/login/LoginActivity.kt

@@ -11,7 +11,6 @@ import androidx.activity.viewModels
 import androidx.biometric.BiometricPrompt
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.isVisible
-import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
 import com.projectdelta.zoro.R
 import com.projectdelta.zoro.data.preferences.UserPreferences
@@ -29,7 +28,6 @@ import com.projectdelta.zoro.util.system.lang.toEditable
 import com.projectdelta.zoro.util.work.UpdateDatabaseWorker
 import com.tapadoo.alerter.Alerter
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class LoginActivity : BaseViewBindingActivity<ActivityLoginBinding>() {

app/src/main/java/com/projectdelta/zoro/ui/main/MainActivity.kt

@@ -34,14 +34,14 @@ class MainActivity : BaseViewBindingActivity<ActivityMainBinding>() {
 
         _binding = ActivityMainBinding.inflate(layoutInflater)
 
+        setSecureMode()
+
         setContentView(binding.root)
 
         registerObservers()
 
         setupNavController()
 
-        initUI()
-
     }
 
     private fun registerObservers() {
@@ -50,23 +50,20 @@ class MainActivity : BaseViewBindingActivity<ActivityMainBinding>() {
 
         connectivityManager.isNetworkAvailable.observe(this) { isOnline ->
             when (isOnline) {
-                true -> {
-                    viewModel.registerClient(userPreferences?.userId!!)
-                }
-                false -> {
-                    viewModel.unregisterClient()
-                }
+                true -> viewModel.registerClient(userPreferences?.userId!!)
+                false -> viewModel.unregisterClient()
             }
         }
 
         collectLatestLifecycleFlow(viewModel.newMessage) {
-            if (it != null)
+            if (it != null) {
                 Alerter.create(this@MainActivity)
                     .setTitle("New Message from a friend.")// TODO( Fetch SenderName form server to display here )
                     .setText(it.data!!)
                     .setDuration(ALERT_NOTIFICATION_DURATION)
                     .setBackgroundColorInt(getResourceColor(R.attr.colorAccent))
                     .show()
+            }
         }
 
         collectLatestLifecycleFlow(viewModel.bottomNavVisibility) { integer ->
@@ -95,10 +92,6 @@ class MainActivity : BaseViewBindingActivity<ActivityMainBinding>() {
         }
     }
 
-    private fun initUI() {
-
-    }
-
     fun launchWebView(url: String, title: String?) {
         WebViewActivity.newIntent(this, url, null, title).also {
             startActivity(it)

app/src/main/java/com/projectdelta/zoro/ui/main/home/HomeFragment.kt

@@ -29,6 +29,10 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 @AndroidEntryPoint
 class HomeFragment : BaseViewBindingFragment<FragmentHomeBinding>() {
 
+    companion object{
+        private const val DEFAULT_QUERY_HINT = "Contact name..."
+    }
+
     private var adapter: HomeRecyclerViewAdapter? = null
 
     private val viewModel: HomeViewModel by viewModels()
@@ -72,7 +76,7 @@ class HomeFragment : BaseViewBindingFragment<FragmentHomeBinding>() {
     private fun setSearchBar() {
         val searchView: SearchView? =
             binding.toolbar.menu.findItem(R.id.action_search).actionView as SearchView?
-        searchView?.queryHint = "Contact name..."
+        searchView?.queryHint = DEFAULT_QUERY_HINT
 
         searchView?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String?): Boolean {

app/src/main/java/com/projectdelta/zoro/ui/main/user/UserFragment.kt

@@ -74,8 +74,6 @@ class UserFragment : BaseViewBindingFragment<FragmentUserBinding>() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        registerObservers()
-
         initUI()
 
     }
@@ -100,8 +98,6 @@ class UserFragment : BaseViewBindingFragment<FragmentUserBinding>() {
 
     }
 
-    private fun registerObservers() {}
-
     private fun showQr() {
         qrViewBinding.imageQr.setImageBitmap(viewModel.qrBitmap)
         MaterialDialog(requireActivity()).show {

app/src/main/java/com/projectdelta/zoro/util/networking/amqp/RabbitMQClient.kt

@@ -13,8 +13,6 @@ import com.rabbitmq.client.AMQP
 import com.rabbitmq.client.Channel
 import com.rabbitmq.client.Connection
 import com.rabbitmq.client.ConnectionFactory
-import com.rabbitmq.client.DefaultConsumer
-import com.rabbitmq.client.Envelope
 import timber.log.Timber
 import java.io.IOException
 import java.util.concurrent.TimeoutException
@@ -44,7 +42,8 @@ class RabbitMQClient(
 
     companion object {
 
-        private const val AUTO_ACKNOWLEDGMENT = true
+        private const val AUTO_ACKNOWLEDGMENT = true // send read receipts to broker
+        private const val PORT_FOR_SSL = 5671 // 5671 uses ssl and 5672 does not.
 
         @Volatile
         private var INSTANCE: RabbitMQClient? = null
@@ -81,10 +80,11 @@ class RabbitMQClient(
         factory.username = uName
         factory.password = password
         factory.isAutomaticRecoveryEnabled = false
-        if( port == 5671 )
+        if( port == PORT_FOR_SSL )
             factory.useSslProtocol()
     }
 
+    @Deprecated("Use registerAndConsume instead")
     override fun registerChannel() {
         if (!connected) {
             connected = true
@@ -138,11 +138,6 @@ class RabbitMQClient(
     override fun unregisterChannel() {
         if (connected) {
             connected = false
-//            try {
-//                if (channel.isOpen) channel.close(AMQP.RESOURCE_ERROR, "channel force exit")
-//            } catch (e: Exception) {
-//                Timber.e(e)
-//            }
             try {
                 if (connection.isOpen) connection.close(AMQP.REPLY_SUCCESS, "connection force exit", 10)
             } catch (e: Exception) {

config/detekt/detekt.yml

@@ -22,12 +22,18 @@ style:
     active: true
     maxLineLength: 145
   MagicNumber:
+    active: false
     excludes: [ '**/test/**/*' ]
   NewLineAtEndOfFile:
     active: false
 naming:
   ConstructorParameterNaming:
     active: false
+  VariableNaming:
+    active: false
 performance:
   SpreadOperator:
-    active: false
+    active: false
+exceptions:
+  TooGenericExceptionCaught:
+    active: false