Bug fixes - Firewall progressbar, Screenlock service stop

*Firewall progressbar *Removed the illustrations_loading_svg file and replaced it with the progressbar. *Screenlock service *Screenlock service is started when the device receives SCREEN_LOCK event, the service is stopped once the automatically lock by android smartlock criteria is met. #29 Former-commit-id: af7ac30
celzero · Aug 15, 2020 · 052bee1 · 052bee1
1 parent cc6a699
commit 052bee1
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 729 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -128,7 +128,7 @@
         </service>
 
         <service
-            android:name=".receiver.ScreenLockService"
+            android:name=".receiver.DeviceLockService"
             android:enabled="true"
             android:exported="false"
             android:stopWithTask="false">

diff --git a/app/src/main/java/com/celzero/bravedns/receiver/BraveScreenStateReceiver.kt b/app/src/main/java/com/celzero/bravedns/receiver/BraveScreenStateReceiver.kt
@@ -8,7 +8,6 @@ import android.content.pm.PackageManager
 import android.util.Log
 import com.celzero.bravedns.database.AppDatabase
 import com.celzero.bravedns.database.AppInfo
-import com.celzero.bravedns.service.BraveVPNService
 import com.celzero.bravedns.service.PersistentState
 import com.celzero.bravedns.ui.ApplicationManagerActivity
 import com.celzero.bravedns.ui.HomeScreenActivity
@@ -21,9 +20,9 @@ class BraveScreenStateReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context?, intent: Intent?) {
         if (intent!!.action.equals(Intent.ACTION_SCREEN_OFF)) {
             if(PersistentState.getFirewallModeForScreenState(context!!) && !PersistentState.getScreenLockData(context)) {
-                val newIntent = Intent(context, ScreenLockService::class.java)
-                newIntent.action = ScreenLockService.ACTION_CHECK_LOCK
-                newIntent.putExtra(ScreenLockService.EXTRA_STATE, intent.action)
+                val newIntent = Intent(context, DeviceLockService::class.java)
+                newIntent.action = DeviceLockService.ACTION_CHECK_LOCK
+                newIntent.putExtra(DeviceLockService.EXTRA_STATE, intent.action)
                 context.startService(newIntent)
             }
         } else if (intent.action.equals(Intent.ACTION_USER_PRESENT)) {

diff --git a/...ro/bravedns/receiver/ScreenLockService.kt → ...ro/bravedns/receiver/DeviceLockService.kt b/...ro/bravedns/receiver/ScreenLockService.kt → ...ro/bravedns/receiver/DeviceLockService.kt
@@ -2,22 +2,16 @@ package com.celzero.bravedns.receiver
 
 import android.app.KeyguardManager
 import android.app.Service
-import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.os.IBinder
 import android.os.PowerManager
-import android.os.ResultReceiver
-import android.util.Log
-import com.celzero.bravedns.service.BraveVPNService
 import com.celzero.bravedns.service.PersistentState
-import kotlinx.coroutines.InternalCoroutinesApi
-import java.sql.Time
 import java.util.*
 
 
 
-class ScreenLockService  : Service(){
+class DeviceLockService  : Service(){
 
     private val timer = Timer()
     private var checkLockTask: CheckLockTask? = null
@@ -26,15 +20,13 @@ class ScreenLockService  : Service(){
         return null
     }
 
-    @InternalCoroutinesApi
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         if(intent != null && intent.action == ACTION_CHECK_LOCK){
             checkLock(intent)
         }
         return super.onStartCommand(intent, flags, startId)
     }
 
-    @InternalCoroutinesApi
     private fun checkLock(intent: Intent) {
         val keyguardManager  =  getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
         val powerManager = getSystemService(Context.POWER_SERVICE) as PowerManager
@@ -56,14 +48,17 @@ class ScreenLockService  : Service(){
             checkLockTask = CheckLockTask(this, delayIndex)
             /*Log.i("BraveDNS", java.lang.String.format("LM.checkLock: scheduling CheckLockTask[%x] for %d ms",
                     System.identityHashCode(checkLockTask), checkLockDelays.get(delayIndex)))*/
-            val task = CheckLockTask(this , checkLockDelays.get(delayIndex))
-            timer.schedule(task, checkLockDelays.get(delayIndex).toLong())
+            //val task = CheckLockTask(this , checkLockDelays.get(delayIndex))
+            timer.schedule(checkLockTask, checkLockDelays.get(delayIndex).toLong())
+            this.stopSelf()
         } else {
-            //Log.d("BraveDNS", "LM.checkLock: no need to schedule CheckLockTask")
             if (isProtected && isLocked) {
                 //Log.e("BraveDNS", "Block Traffic Now!")
                 if(PersistentState.getFirewallModeForScreenState(this) && !PersistentState.getScreenLockData(this)) {
                     PersistentState.setScreenLockData(this,true)
+                    checkLockTask?.cancel()
+                    timer.cancel()
+                    this.stopSelf()
                 }
             }
         }
@@ -108,7 +103,7 @@ class ScreenLockService  : Service(){
 
     class CheckLockTask(val context: Context, val delayIndex: Int) : TimerTask() {
         override fun run() {
-            val newIntent = Intent(context, ScreenLockService::class.java)
+            val newIntent = Intent(context, DeviceLockService::class.java)
             newIntent.action = ACTION_CHECK_LOCK
             newIntent.putExtra(EXTRA_CHECK_LOCK_DELAY_INDEX, getSafeCheckLockDelay(delayIndex + 1))
             context.startService(newIntent)

diff --git a/app/src/main/java/com/celzero/bravedns/ui/FirewallActivity.kt b/app/src/main/java/com/celzero/bravedns/ui/FirewallActivity.kt
@@ -6,10 +6,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.provider.Settings
 import android.view.View
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
+import android.widget.*
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
@@ -50,7 +47,7 @@ class FirewallActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     lateinit var itemAdapter: ItemAdapter<FirewallApk>
     lateinit var headerAdapter : ItemAdapter<FirewallHeader>
     private lateinit var progressImageView: ImageView
-    private lateinit var loadingProgressBar: ContentLoadingProgressBar
+    private lateinit var loadingProgressBar: ProgressBar
 
     private lateinit var firewallAllAppsToggle : SwitchCompat
     private lateinit var firewallAllAppsTxt : TextView
@@ -116,7 +113,7 @@ class FirewallActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         }else{
             firewallNotEnabledLL.visibility = View.VISIBLE
             firewallEnableTxt.visibility = View.GONE
-            progressImageView.setImageDrawable(getDrawable(R.drawable.ic_illustrations_loading))
+            //progressImageView.setImageDrawable(getDrawable(R.drawable.ic_illustrations_loading))
         }
 
         categoryState = false
@@ -287,7 +284,8 @@ class FirewallActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
 
     fun updateUI(){
-        progressBarHolder.visibility = View.VISIBLE
+        loadingProgressBar.visibility = View.VISIBLE
+        //progressBarHolder.visibility = View.VISIBLE
         itemAdapter =  ItemAdapter()
         headerAdapter = ItemAdapter()
         itemAdapter.clear()
@@ -366,8 +364,8 @@ class FirewallActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             itemAdapter.add(apkList)
             fastAdapter.notifyAdapterDataSetChanged()
             fastAdapter.notifyDataSetChanged()
-
-            progressBarHolder.visibility = View.GONE
+            loadingProgressBar.visibility = View.GONE
+            //progressBarHolder.visibility = View.GONE
         }
     }