medium_rasp_level_bug_fix

payatu · Dec 11, 2023 · c6a8f4b · c6a8f4b
1 parent 0001b72
commit c6a8f4b
Show file tree

Hide file tree

Showing 10 changed files with 107 additions and 45 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -13,11 +13,14 @@
     <uses-permission android:name="android.permission.SEND_SMS" />
     <uses-permission android:name="android.permission.RECEIVE_SMS" />
 
-
     <permission
         android:name="com.BugBazaar.permission.contacts"
         android:protectionLevel="signature" />
 
+    <uses-feature
+        android:name="android.hardware.telephony"
+        android:required="false" />
+
     <queries>
         <intent>
             <action android:name="android.intent.action.PICK" />
@@ -44,17 +47,18 @@
         tools:replace="android:fullBackupContent"
         tools:targetApi="31">
         <activity
-            android:name=".ExternalAuthLogin" android:launchMode="singleTask"
-            android:exported="true">
+            android:name=".ExternalAuthLogin"
+            android:exported="true"
+            android:launchMode="singleTask">
+            <intent-filter>
+                <data android:scheme="bugbazaar" />
+                <data android:host="externalAuthentication" />
 
-                <intent-filter>
-                    <data android:scheme="bugbazaar"/>
-                    <data android:host="externalAuthentication"/>
-                    <action android:name="android.intent.action.VIEW"/>
-                    <category android:name="android.intent.category.DEFAULT"/>
-                    <category android:name="android.intent.category.BROWSABLE"/>
-                </intent-filter>
+                <action android:name="android.intent.action.VIEW" />
 
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
         </activity>
         <activity
             android:name="com.lingzhiyi.detectfridaxp.MainActivity"
@@ -160,10 +164,11 @@
                 <action android:name="com.BugBazaar.CUSTOMACT" />
             </intent-filter>
         </receiver>
-        <service android:name=".ui.components.SMSService"
-            android:exported="true"
-            android:enabled="true"/>
 
+        <service
+            android:name=".ui.components.SMSService"
+            android:enabled="true"
+            android:exported="true" />
         <service
             android:name="com.darvin.security.IsolatedService"
             android:enabled="true"

diff --git a/app/src/main/java/com/BugBazaar/ui/SplashActivity.java b/app/src/main/java/com/BugBazaar/ui/SplashActivity.java
@@ -82,6 +82,7 @@ else if (switch3State) {
 
 
                     alertDialogManager.showRootedDeviceAlert(SplashActivity.this,"WE ARE IN PROGRESS");
+                    finishAffinity();
 
                 }
 
@@ -145,8 +146,6 @@ public void onMagiskNotDetected() {
         checkdetect.someMethod(SplashActivity.this);
 
 
-
-
     }
 
 

diff --git a/app/src/main/java/com/BugBazaar/utils/AlertDialogManager.java b/app/src/main/java/com/BugBazaar/utils/AlertDialogManager.java
@@ -27,7 +27,7 @@ public void showRootedDeviceAlert(final Context context, String message) {
                 public void run() {
                     alertDialog.dismiss(); // Dismiss the dialog if it's still visible
                     ((Activity) context).finish();
-                    System.exit(0);
+
                 }
             }, 2000);
         }

diff --git a/app/src/main/java/com/bug/hook/EmulatorCheckUtil.java b/app/src/main/java/com/bug/hook/EmulatorCheckUtil.java
@@ -0,0 +1,39 @@
+package com.bug.hook;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.os.Vibrator;
+import android.util.Log;
+
+public class EmulatorCheckUtil {
+
+    public static boolean emulatorCheck(Context context) {
+        PackageManager packageManager = context.getPackageManager();
+
+        boolean hasCameraFlash = packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH);
+        boolean hasFingerprintSensor = packageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT);
+        boolean hasVibration = hasVibrationCapability(context);
+
+        return !(hasCameraFlash && hasFingerprintSensor && hasVibration);
+    }
+
+    private static boolean hasVibrationCapability(Context context) {
+        try {
+            Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
+            if (vibrator != null) {
+                // Check if the device supports vibration
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    return vibrator.hasVibrator();
+                } else {
+                    return true; // For devices before Android O, assume vibration support
+                }
+            }
+        } catch (Exception e) {
+            Log.e("EmulatorCheckUtil", "Error checking vibration capability: " + e.getMessage());
+        }
+
+        return false;
+    }
+}
+
diff --git a/app/src/main/java/com/bug/hook/checkdetect.java b/app/src/main/java/com/bug/hook/checkdetect.java
@@ -16,7 +16,7 @@ public class checkdetect {
 
     public void someMethod(final Context context) {
 
-        if ( emultorcheck.isEmulator(context)) {
+        if ( emultorcheck.isEmulator() || AdbEnabled.AdbEnabled1(context)) {
 
             if (Looper.myLooper() == Looper.getMainLooper()) {
                 // You are on the UI thread, you can show the dialog directly
@@ -39,7 +39,6 @@ public void run() {
             launchapp(context);
         }
 
-
     }
 
     private void launchapp(Context context) {

diff --git a/app/src/main/java/com/bug/hook/emultorcheck.java b/app/src/main/java/com/bug/hook/emultorcheck.java
@@ -1,14 +1,30 @@
 package com.bug.hook;
 
-import android.app.ActivityManager;
 import android.content.Context;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.os.Build;
 import android.util.Log;
 
+import java.util.HashSet;
+import java.util.Set;
+
 public class emultorcheck {
+
+
+    public static boolean isEmulator() {
+        return Build.FINGERPRINT.startsWith("generic")
+                || Build.FINGERPRINT.startsWith("unknown")
+                || Build.MODEL.contains("google_sdk")
+                || Build.MODEL.contains("Emulator")
+                || Build.MODEL.contains("Android SDK built for x86")
+                || Build.MANUFACTURER.contains("Genymotion")
+                || (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic"))
+                || "google_sdk".equals(Build.PRODUCT);
+    }
+
     static int[] sensorTypes = {
             Sensor.TYPE_ACCELEROMETER,
             Sensor.TYPE_AMBIENT_TEMPERATURE,
@@ -33,29 +49,33 @@ public class emultorcheck {
             // Add more sensor types as needed
     };
 
-    public static boolean isEmulator(Context context) {
-        Log.d("cool","hello");
-        SensorManager sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
-        Sensor accelerometer = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
-
+    static Set<Integer> emulatorSensorTypes = new HashSet<>();
 
+    static {
+        // Add sensor types that are commonly not available in emulators
+        emulatorSensorTypes.add(Sensor.TYPE_AMBIENT_TEMPERATURE);
+        emulatorSensorTypes.add(Sensor.TYPE_HEART_RATE);
+        emulatorSensorTypes.add(Sensor.TYPE_STEP_COUNTER);
+        emulatorSensorTypes.add(Sensor.TYPE_STEP_DETECTOR);
+        // Add more sensor types as needed
+    }
 
+    public static boolean isEmulator(Context context) {
+        Log.d("cool", "hello");
+        SensorManager sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
 
         for (int sensorType : sensorTypes) {
             Sensor sensor = sensorManager.getDefaultSensor(sensorType);
             Log.d("hellocool", String.valueOf(sensor));
 
-            if (sensor == null) {
-
+            if (emulatorSensorTypes.contains(sensorType)) {
 
+                Log.d("hellocool", String.valueOf(sensorType));
                 // Sensor of the specified type is not available on this device (likely an emulator)
                 return true;
             }
-
-
         }
 
-
         ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
 
@@ -66,16 +86,7 @@ public static boolean isEmulator(Context context) {
             isEmulator = true;
         }
 
-        ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-        ActivityManager.MemoryInfo memoryInfo = new ActivityManager.MemoryInfo();
-        activityManager.getMemoryInfo(memoryInfo);
-
-
-
-        if (memoryInfo.lowMemory) {
-            // Low memory condition (may indicate emulator)
-            isEmulator = true;
-        }
+        // Add other checks if needed
 
         return isEmulator;
     }

diff --git a/app/src/main/java/com/darvin/security/DetectMagisk.java b/app/src/main/java/com/darvin/security/DetectMagisk.java
@@ -47,10 +47,10 @@ private void checkForMagisk() {
         try {
             Log.d(TAG, "UID:" + Os.getuid());
             if (serviceBinder.isMagiskPresent() || Native.isMagiskPresentNative() ) {
-                Log.d("hacker","detect");
+
 
                 if (listener != null) {
-                    Log.d("hacker","detect");
+
 
                     listener.onMagiskDetected();
                 }
@@ -60,7 +60,7 @@ private void checkForMagisk() {
                 }
             }
         } catch (RemoteException e) {
-            Log.d("hacker","error");
+
         }
     }
 

diff --git a/app/src/main/res/layout/activity_main2.xml b/app/src/main/res/layout/activity_main2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.darvin.security.MainActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/build.gradle b/build.gradle
@@ -10,6 +10,6 @@ buildscript {
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
 
-    id 'com.android.application' version '8.1.0' apply false
-    id 'com.android.library' version '8.1.0' apply false
+    id 'com.android.application' version '8.0.0' apply false
+    id 'com.android.library' version '8.0.0' apply false
 }