diff --git a/app/src/main/java/ru/vtosters/hooks/MainActivityInjector.java b/app/src/main/java/ru/vtosters/hooks/MainActivityInjector.java index d1f85c838..a64f08288 100644 --- a/app/src/main/java/ru/vtosters/hooks/MainActivityInjector.java +++ b/app/src/main/java/ru/vtosters/hooks/MainActivityInjector.java @@ -5,6 +5,8 @@ import android.content.Intent; import android.os.Build; import b.h.g.k.VKProgressDialog; import com.aefyr.tsg.g2.TelegramStickersService; +import com.guardanis.applock.AppLock; +import com.guardanis.applock.activities.UnlockActivity; import com.vk.core.dialogs.alert.VkAlertDialog; import com.vtosters.lite.R; import ru.vtosters.hooks.other.Preferences; @@ -67,6 +69,13 @@ public class MainActivityInjector { TelegramStickersService.getInstance(activity); } + public static void applock(Activity activity) { + if (AppLock.isUnlockRequired(activity)) { + var intent = new Intent(activity, UnlockActivity.class); + activity.startActivity(intent); + } + } + private static void updateBinsAndTmpArchive(Activity activity) { final VKProgressDialog dialog = new VKProgressDialog(activity); diff --git a/app/src/main/java/ru/vtosters/lite/utils/LifecycleUtils.java b/app/src/main/java/ru/vtosters/lite/utils/LifecycleUtils.java index a6d4a5fc4..dfa589083 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/LifecycleUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/LifecycleUtils.java @@ -47,7 +47,7 @@ public class LifecycleUtils { public void onActivityCreated(Activity activity, Bundle bundle) { activities.add(activity); - if (AppLock.isUnlockRequired(activity)) { + if (AppLock.isUnlockRequired(activity) && activity.getClass() != MainActivity.class) { var intent = new Intent(activity, UnlockActivity.class); activity.startActivity(intent); } @@ -61,7 +61,7 @@ public class LifecycleUtils { } public static Activity getCurrentActivity() { - return activities.size() > 0 ? activities.get(activities.size() - 1) : new MainActivity(); + return !activities.isEmpty() ? activities.get(activities.size() - 1) : new MainActivity(); } public static void restartApplication() { diff --git a/smali/smali_classes4/com/vtosters/lite/MainActivity.smali b/smali/smali_classes4/com/vtosters/lite/MainActivity.smali index 0e65b9e6e..27bbb8f85 100644 --- a/smali/smali_classes4/com/vtosters/lite/MainActivity.smali +++ b/smali/smali_classes4/com/vtosters/lite/MainActivity.smali @@ -546,6 +546,8 @@ invoke-virtual {p0, p1, v0}, Landroidx/fragment/app/FragmentActivity;->startActivityForResult(Landroid/content/Intent;I)V :goto_1 + invoke-static {p0}, Lru/vtosters/hooks/MainActivityInjector;->applock(Landroid/app/Activity;)V + return-void .end method