Merge pull request #3 from ICTrust/dev

v1.3

.gitignore

@@ -86,6 +86,10 @@ lint/outputs/
 lint/tmp/
 # lint/reports/
 
-# 21.05.2021
-app/google-services.json
+
+# app/google-services.json
 app/release/
+
+# ignore .DS_Store
+app/.DS_Store
+.DS_Store

app/build.gradle

@@ -4,14 +4,17 @@ apply plugin: 'kotlin-android'
 
 apply plugin: 'kotlin-android-extensions'
 
+apply plugin: 'kotlin-kapt'
+
+
 android {
     compileSdkVersion 33
     defaultConfig {
         applicationId "ch.ictrust.pobya"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 1
-        versionName "1.2"
+        versionCode 5
+        versionName "1.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -30,6 +33,7 @@ android {
 }
 
 dependencies {
+
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.2.0'
@@ -87,6 +91,8 @@ dependencies {
     // floating Action button
     implementation 'com.github.clans:fab:1.6.4'
 
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0")
 }
 
 apply plugin: 'com.google.gms.google-services'

app/google-services.json

@@ -0,0 +1,40 @@
+{
+  "project_info": {
+    "project_number": "402246713934",
+    "firebase_url": "https://poby-a-default-rtdb.europe-west1.firebasedatabase.app",
+    "project_id": "poby-a",
+    "storage_bucket": "poby-a.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:402246713934:android:1213cbe35d57579cc7b91f",
+        "android_client_info": {
+          "package_name": "ch.ictrust.pobya"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "402246713934-ngr43ln0kbmv26269ipci0tu5t33r8gs.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCZ9ONPWTym1X3U4G925by2xNRJUmg8dpY"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "402246713934-ngr43ln0kbmv26269ipci0tu5t33r8gs.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

app/src/main/AndroidManifest.xml

@@ -39,6 +39,9 @@
             android:name=".activity.InstalledAppsActivity"/>
         <activity
             android:name=".activity.AppDetailActivity"/>
+        <activity
+            android:name=".activity.MalwareScanActivity"
+            android:screenOrientation="portrait" />
 
         <receiver
             android:name="ch.ictrust.pobya.Utillies.AppAdminReceiver"

app/src/main/java/ch/ictrust/pobya/Utillies/DumpApps.kt

@@ -8,8 +8,8 @@ import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.os.Build
 import android.util.Log
-import androidx.annotation.RequiresApi
 import ch.ictrust.pobya.R
+import ch.ictrust.pobya.models.AppState
 import ch.ictrust.pobya.models.InstalledApp
 import ch.ictrust.pobya.models.PermissionModel
 import java.io.ByteArrayOutputStream
@@ -46,12 +46,6 @@ class DumpApps(context: Context?, dumpSysApps: Boolean) {
             val permissionsList: MutableList<PermissionModel> = ArrayList()
             val reqPermissions = pInfo.requestedPermissions
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                println(pInfo.signingInfo.getApkContentsSigners())
-            } else {
-                println(pInfo.signatures)
-            }
-
             var state: AppState = AppState.NORMAL
             if (reqPermissions != null) state = getAppConfidence(pInfo)
             if (!dumpSystemApps && isSystemPackage(pInfo) == 1) {

app/src/main/java/ch/ictrust/pobya/Utillies/FirebaseHelper.kt

@@ -0,0 +1,22 @@
+package ch.ictrust.pobya.Utillies
+
+import com.google.firebase.database.*
+
+class FirebaseHelper {
+    companion object {
+        var mDatabase : FirebaseDatabase = FirebaseDatabase.getInstance().apply {
+            setPersistenceEnabled(true)
+            getReference("packages").keepSynced(true)
+        }
+        var db: DatabaseReference = mDatabase.reference
+    }
+
+    fun getDatabaseReference(): DatabaseReference {
+        return db
+    }
+
+    fun getDatabase(): FirebaseDatabase {
+        return mDatabase
+    }
+
+}

app/src/main/java/ch/ictrust/pobya/Utillies/Prefs.kt

@@ -17,7 +17,7 @@ class Prefs private constructor(context: Context) {
 
     companion object {
 
-        private val PREFS_NAME = "my_prefs"
+        private val PREFS_NAME = "Settings"
         private val ISFIRSTRUN = "isFirstRun"
 
         private var instance: Prefs? = null

app/src/main/java/ch/ictrust/pobya/Utillies/Utilities.kt

@@ -4,17 +4,9 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
 import androidx.core.app.ActivityCompat
-import java.text.SimpleDateFormat
-import java.util.*
 
 
 object Utilities {
-
-    fun toDateString(date: Date) : String {
-        val format = SimpleDateFormat("MMM dd yyyy")
-        return format.format(date)
-    }
-
     /**
      * Check user permission
      *

app/src/main/java/ch/ictrust/pobya/activity/InstalledAppsActivity.kt

@@ -20,6 +20,7 @@ import ch.ictrust.pobya.adapter.InstalledAppsAdapter
 import ch.ictrust.pobya.listener.ItemClickListener
 import ch.ictrust.pobya.models.InstalledApp
 import com.github.clans.fab.FloatingActionButton
+import com.github.clans.fab.FloatingActionMenu
 import kotlinx.android.synthetic.main.activity_installed_apps.*
 import java.lang.ref.WeakReference
 
@@ -32,6 +33,7 @@ class InstalledAppsActivity : AppCompatActivity(), ItemClickListener {
     private lateinit var installedAppsAdapter: InstalledAppsAdapter
     private lateinit var progressScanApps : ProgressBar
     private lateinit var floatingActionButton: FloatingActionButton
+    private lateinit var floatingActionMenu: FloatingActionMenu
     private var showSystemApps = false
 
 
@@ -42,6 +44,7 @@ class InstalledAppsActivity : AppCompatActivity(), ItemClickListener {
 
         progressScanApps = findViewById(R.id.loading_spinner_apps)
         floatingActionButton = findViewById(R.id.menu_item)
+        floatingActionMenu = findViewById(R.id.menu_group)
 
         val actionbar: ActionBar? = supportActionBar
         actionbar?.apply {
@@ -57,13 +60,6 @@ class InstalledAppsActivity : AppCompatActivity(), ItemClickListener {
         toolbar.setNavigationOnClickListener {
             finish()
         }
-        toolbar.setOnMenuItemClickListener { item ->
-            when (item.itemId) {
-                R.id.show_sys_apps -> {
-                }
-            }
-            true
-        }
 
         val scanApps = AsyncDumpInstalledApps(this, false)
         scanApps.execute()
@@ -72,15 +68,17 @@ class InstalledAppsActivity : AppCompatActivity(), ItemClickListener {
 
         floatingActionButton.setOnClickListener {
             showSystemApps = !showSystemApps
-
+            floatingActionButton.labelText = getString(R.string.hide_sys_apps)
+            floatingActionButton.colorNormal = R.color.colorPrimaryDark
+            val scanApps = AsyncDumpInstalledApps(this, showSystemApps)
+            scanApps.execute()
+            if(showSystemApps){
                 floatingActionButton.labelText = getString(R.string.hide_sys_apps)
-                floatingActionButton.colorNormal = R.color.colorPrimaryDark
-                val scanApps = AsyncDumpInstalledApps(this, showSystemApps)
-                scanApps.execute()
-                if(showSystemApps)
-                    floatingActionButton.labelText = getString(R.string.hide_sys_apps)
-                else
-                    floatingActionButton.labelText = getString(R.string.show_sys_apps)
+                floatingActionMenu.close(true)
+            } else {
+                floatingActionButton.labelText = getString(R.string.show_sys_apps)
+                floatingActionMenu.close(true)
+            }
         }
 
     }
@@ -105,7 +103,7 @@ class InstalledAppsActivity : AppCompatActivity(), ItemClickListener {
         applicationList = listApps
         installedAppsAdapter = InstalledAppsAdapter(listApps, this)
         installedAppsAdapter.setClickListener(this)
-        recyclerView.apply {
+        recyclerViewSettings.apply {
             layoutManager = LinearLayoutManager(this.context, LinearLayoutManager.VERTICAL, false)
             adapter = installedAppsAdapter
         }
@@ -127,15 +125,13 @@ class InstalledAppsActivity : AppCompatActivity(), ItemClickListener {
         private var applicationList: MutableList<InstalledApp> = mutableListOf()
 
 
-        @Deprecated("Deprecated in Java")
         @RequiresApi(Build.VERSION_CODES.M)
         override fun doInBackground(vararg params: Void): MutableList<InstalledApp>? {
             var dumpApps: DumpApps = DumpApps(appContext, dumpSysApps)
             dumpApps.getListApps().also { applicationList = it }
             return  applicationList
         }
 
-        @Deprecated("Deprecated in Java")
         override fun onPreExecute() {
             super.onPreExecute()
             val activity = activityReference.get()
@@ -144,7 +140,6 @@ class InstalledAppsActivity : AppCompatActivity(), ItemClickListener {
             }
         }
 
-        @Deprecated("Deprecated in Java")
         @RequiresApi(Build.VERSION_CODES.M)
         override fun onPostExecute(result: MutableList<InstalledApp>) {
             super.onPostExecute(result)

app/src/main/java/ch/ictrust/pobya/activity/MainActivity.kt

@@ -24,7 +24,6 @@ import ch.ictrust.pobya.R
 import ch.ictrust.pobya.fragment.*
 import com.google.android.material.navigation.NavigationView
 import kotlinx.android.synthetic.main.app_bar_main.toolbarTitle
-import android.view.animation.AnimationUtils
 
 
 class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener {
@@ -36,6 +35,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
     private val RESULT_ENABLE = 11
     private val CODE_WRITE_SETTINGS_PERMISSION = 42
 
+
     @RequiresApi(Build.VERSION_CODES.M)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -114,10 +114,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         this.menu = menu
         return false
     }
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
+    override fun onOptionsItemSelected(item: MenuItem): Boolean { 
 
         return false
     }
@@ -135,13 +132,8 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
                 transaction.commit()
             }
             R.id.nav_malware_scan -> {
-                toolbarTitle.text = getString(R.string.menu_malware_scan)
-                val transaction = supportFragmentManager.beginTransaction()
-                // Replace the fragment on container
-                transaction.replace(R.id.container, MalwareScanFragment())
-                transaction.addToBackStack(null)
-                // Finishing the transition
-                transaction.commit()
+                val intent = Intent(this, MalwareScanActivity::class.java)
+                startActivity(intent)
             }
             R.id.nav_settings_scan -> {
                 toolbarTitle.text = getString(R.string.menu_privacy_settings)