From cdf520eb687fe4278fdbf9aa7b7d390c785dc0b2 Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerryc05@qq.com>
Date: Tue, 16 Jul 2019 01:16:09 -0400
Subject: [PATCH] v0.1.3; bug fix for notification touch event

Signed-off-by: Jerry Chen <jerryc05@qq.com>
---
 app/build.gradle                              |  2 +-
 .../helpers/URLConnectionBuilder.java         |  1 -
 .../unlockme/helpers/UserInterface.java       |  3 +-
 .../helpers/camera/Camera1APIHelper.java      |  3 ++
 .../unlockme/services/ForegroundService.java  | 31 ++++++++++---------
 5 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f3b04aa..17a0d13 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 29
         versionCode 1
-        versionName "0.1.2"
+        versionName "0.1.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resConfigs "xxhdpi"
     }
diff --git a/app/src/main/java/jerryc05/unlockme/helpers/URLConnectionBuilder.java b/app/src/main/java/jerryc05/unlockme/helpers/URLConnectionBuilder.java
index c7cd033..e5ef231 100644
--- a/app/src/main/java/jerryc05/unlockme/helpers/URLConnectionBuilder.java
+++ b/app/src/main/java/jerryc05/unlockme/helpers/URLConnectionBuilder.java
@@ -19,7 +19,6 @@
 import javax.net.ssl.HttpsURLConnection;
 
 import jerryc05.unlockme.BuildConfig;
-import jerryc05.unlockme.activities.MainActivity;
 
 /**
  * A builder for URLConnection class.
diff --git a/app/src/main/java/jerryc05/unlockme/helpers/UserInterface.java b/app/src/main/java/jerryc05/unlockme/helpers/UserInterface.java
index d56fe6e..100d996 100644
--- a/app/src/main/java/jerryc05/unlockme/helpers/UserInterface.java
+++ b/app/src/main/java/jerryc05/unlockme/helpers/UserInterface.java
@@ -18,6 +18,7 @@
 import jerryc05.unlockme.services.ForegroundService;
 
 import static android.content.Context.NOTIFICATION_SERVICE;
+import static jerryc05.unlockme.services.ForegroundService.ACTION_UPDATE_NOTIFICATION;
 
 /**
  * A collection class for commonly used User Interface methods.
@@ -103,7 +104,7 @@ public static void notifyPictureToUI(final String contentText,
     final String title = "Picture Taken";
 
     final Intent intent = new Intent(context, ForegroundService.class);
-    intent.setAction(ForegroundService.ACTION_UPDATE_NOTIFICATION);
+    intent.setAction(ACTION_UPDATE_NOTIFICATION);
 
     final PendingIntent pendingIntent;
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
diff --git a/app/src/main/java/jerryc05/unlockme/helpers/camera/Camera1APIHelper.java b/app/src/main/java/jerryc05/unlockme/helpers/camera/Camera1APIHelper.java
index f3b02cf..64750be 100644
--- a/app/src/main/java/jerryc05/unlockme/helpers/camera/Camera1APIHelper.java
+++ b/app/src/main/java/jerryc05/unlockme/helpers/camera/Camera1APIHelper.java
@@ -95,6 +95,9 @@ public void onPictureTaken(byte[] data, Camera camera) {
 
   @SuppressWarnings("WeakerAccess")
   static void closeCamera1(Camera camera) {
+    if(BuildConfig.DEBUG)
+      Log.d(TAG, "closeCamera1: ");
+
     camera.stopPreview();
     camera.release();
     mCamera = null;
diff --git a/app/src/main/java/jerryc05/unlockme/services/ForegroundService.java b/app/src/main/java/jerryc05/unlockme/services/ForegroundService.java
index 292b667..0dca8aa 100644
--- a/app/src/main/java/jerryc05/unlockme/services/ForegroundService.java
+++ b/app/src/main/java/jerryc05/unlockme/services/ForegroundService.java
@@ -13,6 +13,7 @@
 
 import jerryc05.unlockme.BuildConfig;
 import jerryc05.unlockme.helpers.UserInterface;
+import jerryc05.unlockme.helpers.camera.CameraBaseAPIClass;
 import jerryc05.unlockme.receivers.MyDeviceAdminReceiver;
 
 import static jerryc05.unlockme.helpers.UserInterface.notifyToForegroundService;
@@ -26,10 +27,6 @@ public class ForegroundService extends Service {
   private             ThreadPoolExecutor threadPoolExecutor;
   MyDeviceAdminReceiver myDeviceAdminReceiver;
 
-//  public ForegroundService() {
-//    super("ForegroundService");
-//  }
-
   @Override
   public void onCreate() {
     super.onCreate();
@@ -54,17 +51,21 @@ public void run() {
     });
   }
 
-//  @Override
-//  protected void onHandleIntent(Intent intent) {
-//    if (BuildConfig.DEBUG)
-//      Log.d(TAG, "onHandleIntent: ");
-//
-//    if (ACTION_UPDATE_NOTIFICATION.equals(intent.getAction()))
-//      UserInterface.notifyToForegroundService(this);//todo
-//    else
-//      CameraBaseAPIClass.getImageFromDefaultCamera(
-//              this, true);
-//  }
+  @Override
+  public int onStartCommand(Intent intent, int flags, int startId) {
+    threadPoolExecutor.execute(new Runnable() {
+      @Override
+      public void run() {
+        if (ACTION_UPDATE_NOTIFICATION.equals(intent.getAction()))
+          UserInterface.notifyToForegroundService(ForegroundService.this);
+        else
+          CameraBaseAPIClass.getImageFromDefaultCamera(
+                  ForegroundService.this, true);
+      }
+    });
+
+    return super.onStartCommand(intent, flags, startId);
+  }
 
   private ThreadPoolExecutor getThreadPoolExecutor() {
     if (threadPoolExecutor == null) {