closes #11,#12,#13,#14,#15,#22.#23

SubhamTyagi · SubhamTyagi · commit 61a609b7c8f7 · 2019-03-14T21:27:04.000+05:30
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "io.github.subhamtyagi.privacyapplock"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 5
-        versionName "1.0.5"
+        versionCode 6
+        versionName "1.0.6"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/java/com/lzx/lock/activities/lock/GestureUnlockActivity.java b/app/src/main/java/com/lzx/lock/activities/lock/GestureUnlockActivity.java
@@ -34,6 +34,8 @@
 
 import java.util.List;
 
+import io.github.subhamtyagi.crashreporter.CrashReporter;
+
 /**
  * Created by xian on 2017/2/17.
  */
@@ -130,7 +132,11 @@ public boolean onPreDraw() {
                                     height = size.y;
                                 }
                                 Bitmap bmp = LockUtil.drawableToBitmap(icon, width, height);
-                                LockUtil.blur(GestureUnlockActivity.this, LockUtil.big(bmp), mUnLockLayout);
+                                try {
+                                    LockUtil.blur(GestureUnlockActivity.this, LockUtil.big(bmp), mUnLockLayout,width,height);
+                                }catch (IllegalArgumentException ignore){
+                                    CrashReporter.logException(ignore);
+                                }
                                 return true;
                             }
                         });
diff --git a/app/src/main/java/com/lzx/lock/activities/main/SplashActivity.java b/app/src/main/java/com/lzx/lock/activities/main/SplashActivity.java
@@ -49,7 +49,6 @@ protected void initViews(Bundle savedInstanceState) {
 
     @Override
     protected void initData() {
-        //TODO: pie compatable done
         //startService(new Intent(this, LoadAppListService.class));
         BackgroundManager.getInstance().init(this).startService(LoadAppListService.class);
 
diff --git a/app/src/main/java/com/lzx/lock/activities/setting/LockSettingActivity.java b/app/src/main/java/com/lzx/lock/activities/setting/LockSettingActivity.java
@@ -110,16 +110,19 @@ protected void initAction() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
                 SpUtil.getInstance().putBoolean(AppConstants.LOCK_STATE, b);
-                Intent intent = new Intent(LockSettingActivity.this, LockService.class);
+                //Intent intent = new Intent(LockSettingActivity.this, LockService.class);
                 if (b) {
-                    mLockTip.setText("Opened, password is required when the lock application is opened");
-
+                    mLockTip.setText(R.string.pattern_is_required);
+                    //restart service
+                    BackgroundManager.getInstance().init(LockSettingActivity.this).stopService(LockService.class);
                     BackgroundManager.getInstance().init(LockSettingActivity.this).startService(LockService.class);
 
+                    BackgroundManager.getInstance().init(LockSettingActivity.this).startAlarmManager();
+
                 } else {
-                    mLockTip.setText("Closed, no password is required when the lock app opens");
+                    mLockTip.setText(R.string.pattern_is_not_required);
                     BackgroundManager.getInstance().init(LockSettingActivity.this).stopService(LockService.class);
-
+                    BackgroundManager.getInstance().init(LockSettingActivity.this).stopAlarmManager();
                 }
             }
         });
@@ -146,10 +149,12 @@ public void onClick(@NonNull View view) {
                 boolean ishideline = SpUtil.getInstance().getBoolean(AppConstants.LOCK_IS_HIDE_LINE, false);
                 if (ishideline) {
                     SpUtil.getInstance().putBoolean(AppConstants.LOCK_IS_HIDE_LINE, false);
-                    ToastUtil.showToast("Path is displayed");
+                    mIsShowPath.setText(R.string.hide_pattern);
+                    ToastUtil.showToast("Pattern is displayed");
                 } else {
                     SpUtil.getInstance().putBoolean(AppConstants.LOCK_IS_HIDE_LINE, true);
-                    ToastUtil.showToast("Path is hidden");
+                    mIsShowPath.setText(R.string.show_pattern);
+                    ToastUtil.showToast("Pattern is hidden");
                 }
                 break;
             case R.id.lock_screen:
diff --git a/app/src/main/java/com/lzx/lock/receiver/LockRestarterBroadcastReceiver.java b/app/src/main/java/com/lzx/lock/receiver/LockRestarterBroadcastReceiver.java
@@ -14,7 +14,8 @@ public class LockRestarterBroadcastReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        if (intent != null) {
+        boolean lockState=SpUtil.getInstance().getBoolean(AppConstants.LOCK_STATE);
+        if (intent != null && lockState) {
             String type = intent.getStringExtra("type");
             if (type.contentEquals("lockservice"))
                 //context.startService(new Intent(context, LockService.class));
diff --git a/app/src/main/java/com/lzx/lock/services/BackgroundManager.java b/app/src/main/java/com/lzx/lock/services/BackgroundManager.java
@@ -84,6 +84,7 @@ private void checkContext() {
 
     public void stopService(Class<?> serviceClass) {
         checkContext();
-        ctx.stopService(new Intent(ctx, serviceClass));
+        if (isServiceRunning(LockService.class))
+            ctx.stopService(new Intent(ctx, serviceClass));
     }
 }
diff --git a/app/src/main/java/com/lzx/lock/services/LockService.java b/app/src/main/java/com/lzx/lock/services/LockService.java
@@ -229,9 +229,12 @@ public void onDestroy() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             NotificationUtil.cancelNotification(this);
         }
-        Intent intent = new Intent(this, LockRestarterBroadcastReceiver.class);
-        intent.putExtra("type", "lockservice");
-        sendBroadcast(intent);
+        lockState = SpUtil.getInstance().getBoolean(AppConstants.LOCK_STATE);
+        if (lockState) {
+            Intent intent = new Intent(this, LockRestarterBroadcastReceiver.class);
+            intent.putExtra("type", "lockservice");
+            sendBroadcast(intent);
+        }
         unregisterReceiver(mServiceReceiver);
     }
 
@@ -244,14 +247,17 @@ public void onTaskRemoved(Intent rootIntent) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             NotificationUtil.cancelNotification(this);
         }
-        Intent restartServiceTask = new Intent(getApplicationContext(), this.getClass());
-        restartServiceTask.setPackage(getPackageName());
-        PendingIntent restartPendingIntent = PendingIntent.getService(getApplicationContext(), 1495, restartServiceTask, PendingIntent.FLAG_ONE_SHOT);
-        AlarmManager myAlarmService = (AlarmManager) getApplicationContext().getSystemService(Context.ALARM_SERVICE);
-        myAlarmService.set(
-                AlarmManager.ELAPSED_REALTIME,
-                SystemClock.elapsedRealtime() + 1500,
-                restartPendingIntent);
+        lockState = SpUtil.getInstance().getBoolean(AppConstants.LOCK_STATE);
+        if (lockState) {
+            Intent restartServiceTask = new Intent(getApplicationContext(), this.getClass());
+            restartServiceTask.setPackage(getPackageName());
+            PendingIntent restartPendingIntent = PendingIntent.getService(getApplicationContext(), 1495, restartServiceTask, PendingIntent.FLAG_ONE_SHOT);
+            AlarmManager myAlarmService = (AlarmManager) getApplicationContext().getSystemService(Context.ALARM_SERVICE);
+            myAlarmService.set(
+                    AlarmManager.ELAPSED_REALTIME,
+                    SystemClock.elapsedRealtime() + 1500,
+                    restartPendingIntent);
+        }
 
     }
 
diff --git a/app/src/main/java/com/lzx/lock/utils/LockUtil.java b/app/src/main/java/com/lzx/lock/utils/LockUtil.java
@@ -130,13 +130,13 @@ public static Bitmap drawableToBitmap(Drawable drawable, int width,int height) {
     }
 
     private static final String TAG="LockUtil";
-    public static void blur(Context mContent, @NonNull Bitmap bkg, View view) {
-        long startMs = System.currentTimeMillis();
+    public static void blur(Context mContent, @NonNull Bitmap bkg, View view,int width,int height) {
+        //long startMs = System.currentTimeMillis();
         float radius = 50;
         float scaleFactor = 8;
         Bitmap overlay = Bitmap.createBitmap(
-                (int) (view.getMeasuredWidth() / scaleFactor),
-                (int) (view.getMeasuredHeight() / scaleFactor),
+                (int) (width / scaleFactor),
+                (int) (height/ scaleFactor),
                 Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(overlay);
         canvas.translate(-view.getLeft() / scaleFactor, -view.getTop() / scaleFactor);
diff --git a/app/src/main/java/com/lzx/lock/utils/NotificationUtil.java b/app/src/main/java/com/lzx/lock/utils/NotificationUtil.java
@@ -22,8 +22,6 @@ public class NotificationUtil {
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     public static void createNotification(Service mContext,String title, String message) {
-
-
         Intent resultIntent = new Intent(mContext, MainActivity.class);
         resultIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         PendingIntent resultPendingIntent = PendingIntent.getActivity(mContext, 112 /* Request code */, resultIntent, PendingIntent.FLAG_UPDATE_CURRENT);
@@ -47,7 +45,6 @@ public static void createNotification(Service mContext,String title, String mess
         mContext.startForeground(145,mBuilder.build());
     }
 
-
     public static void cancelNotification(Service mContext){
         NotificationManager mNotificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
         mNotificationManager.cancel(145);
diff --git a/app/src/main/res/layout/activity_about_me.xml b/app/src/main/res/layout/activity_about_me.xml
@@ -85,7 +85,7 @@
         android:layout_marginStart="40dp"
         android:autoLink="web"
         android:padding="@dimen/activity_horizontal_margin"
-        android:text="@string/github_https_github_com_lizixian18"
+        android:text="@string/github_https_github_com_espoir_x"
         android:textColorLink="@color/colorPrimary"/>
 
 
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
@@ -200,7 +200,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:gravity="center_vertical"
-            android:text="Intruder Selfie"
+            android:text="@string/intruder_selfie"
             android:textColor="#2c2c2c"
             android:textSize="14sp"/>
 
@@ -251,7 +251,7 @@
         android:gravity="center_vertical"
         android:paddingLeft="20dp"
         android:paddingRight="20dp"
-        android:text="@string/display_path"
+        android:text="@string/hide_pattern"
         android:textColor="#2c2c2c"
         android:textSize="14sp"/>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -91,7 +91,7 @@
     <string name="github_https_github_com_subhamtyagi">GitHub:https://github.com/subhamtyagi</string>
     <string name="upstream_developer">Upstream Developer</string>
     <string name="up_stream_deve_name_espoir">Espoir</string>
-    <string name="github_https_github_com_lizixian18">GitHub:https://github.com/EspoirX/AppLock</string>
+    <string name="github_https_github_com_espoir_x">GitHub:https://github.com/EspoirX/AppLock</string>
     <string name="welcome_to_the_app_lock">Welcome to the App lock</string>
     <string name="reset">Reset</string>
     <string name="create_pattern">Create pattern</string>
@@ -103,7 +103,8 @@
     <string name="lock_immediately_after_locking_the_screen">Lock app immediately after locking the screen</string>
     <string name="open">Open</string>
     <string name="change_the_password">Change the pattern</string>
-    <string name="display_path">Display path</string>
+    <string name="show_pattern">Show pattern</string>
+    <string name="hide_pattern">Hide pattern</string>
     <string name="about_me">About Me</string>
     <string name="go_to_give_permission">Permit Permission</string>
     <string name="warning">Warning</string>
@@ -115,4 +116,7 @@
     <string name="accessibility_service_description">This permission is only used for locking the apps</string>
     <string name="accessibility_service_name">App lock</string>
     <string name="lock_type">Lock Type</string>
+    <string name="pattern_is_required">Pattern is required when the Locked Apps are opened</string>
+    <string name="pattern_is_not_required">Pattern is not required when the Locked Apps opened</string>
+    <string name="intruder_selfie">Intruder Selfie</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ private void checkContext() {`
`84`	`84`
`85`	`85`	`public void stopService(Class<?> serviceClass) {`
`86`	`86`	`checkContext();`
`87`		`- ctx.stopService(new Intent(ctx, serviceClass));`
	`87`	`+ if (isServiceRunning(LockService.class))`
	`88`	`+ ctx.stopService(new Intent(ctx, serviceClass));`
`88`	`89`	`}`
`89`	`90`	`}`