Video Recording implementation using CameraX lib

build.gradle

@@ -1,11 +1,11 @@
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext.kotlin_version = '1.3.72'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 
@@ -44,7 +44,7 @@ allprojects {
         version_number = getVersionName()
         group_info = "haven"
         buildToolsVersion = "29.0.2"
-        minSdkVersion = 16
+        minSdkVersion = 21
         targetSdkVersion = 29
     }
 
@@ -59,7 +59,7 @@ allprojects {
 
 android {
     compileSdkVersion 29
-    buildToolsVersion = '29.0.2'
+    buildToolsVersion = '29.0.3'
 
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
@@ -82,7 +82,7 @@ android {
         versionCode 2001
         versionName getVersionName()
         archivesBaseName = "Haven-$versionName"
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 29
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_8
@@ -122,7 +122,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    
+
      kotlinOptions {
         jvmTarget = "1.8"
     }
@@ -142,13 +142,13 @@ configurations {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0-alpha1'
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
-    implementation 'androidx.preference:preference:1.1.0'
+    implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'com.google.android.material:material:1.2.0-alpha03'
+    implementation 'com.google.android.material:material:1.3.0-alpha04'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
     implementation 'com.github.guardianproject:signal-cli-android:v0.6.0-android-beta-1'
@@ -169,29 +169,38 @@ dependencies {
     implementation 'com.github.halilozercan:BetterVideoPlayer:1.1.0'
     implementation 'com.github.ybq:Android-SpinKit:1.4.0'
     implementation 'io.github.silvaren:easyrs:0.5.3'
-    implementation 'org.jcodec:jcodec:0.2.5'
-    implementation 'org.jcodec:jcodec-android:0.2.5'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     // Room
     implementation "android.arch.persistence.room:runtime:2.1.0"
     kapt "android.arch.persistence.room:compiler:2.1.0"
     implementation "android.arch.lifecycle:runtime:2.1.0"
     implementation "android.arch.lifecycle:extensions:2.1.0"
-
-    testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test:core:1.2.0'
-    androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
+    implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0"
+
+    testImplementation 'junit:junit:4.13.1'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test:core:1.3.0'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.3.0'
     androidTestImplementation "android.arch.persistence.room:testing:2.1.0"
 
     // android-job
     implementation 'com.evernote:android-job:1.4.2'
 
-    // new camera view: https://github.com/natario1/CameraView
-    implementation 'com.otaliastudios:cameraview:2.4.0'
+    // CameraX core library using camera2 implementation
+    implementation "androidx.camera:camera-camera2:1.0.0-beta12"
+    // CameraX Lifecycle Library
+    implementation "androidx.camera:camera-lifecycle:1.0.0-beta12"
+    // CameraX View class
+    implementation "androidx.camera:camera-view:1.0.0-alpha19"
 
+    // coroutines
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.7'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.3.9'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
 
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.2'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,8 +1,8 @@
-#Sat Dec 07 05:36:14 EST 2019
+#Fri Dec 04 23:39:04 IST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-rc-3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 android.useAndroidX=true
 android.enableD8=true

src/main/java/org/havenapp/main/MonitorActivity.java

@@ -17,15 +17,14 @@
 package org.havenapp.main;
 
 import android.Manifest;
-import android.animation.ValueAnimator;
 import android.app.PictureInPictureParams;
+import android.app.ProgressDialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
-import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.CountDownTimer;
@@ -40,7 +39,11 @@
 import android.view.animation.AnimationUtils;
 import android.widget.Button;
 import android.widget.TextView;
-import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
 
@@ -55,11 +58,6 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
 import static org.havenapp.main.Utils.getTimerText;
 
 public class MonitorActivity extends AppCompatActivity implements TimePickerDialog.OnTimeSetListener {
@@ -83,6 +81,8 @@ public class MonitorActivity extends AppCompatActivity implements TimePickerDial
     private Animation mAnimShake;
     private TextView txtStatus;
 
+    private ProgressDialog progressDialog;
+
     private int lastEventType = -1;
 
     /**
@@ -134,11 +134,14 @@ public void handleMessage(Message msg) {
     BroadcastReceiver receiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-
             int eventType = intent.getIntExtra("type",-1);
-            boolean detected = intent.getBooleanExtra("detected",true);
-            if (detected)
-                handler.sendEmptyMessage(eventType);
+            if (eventType == MonitorService.MSG_STOP_SELF) {
+                notifyMonitoringEnded();
+            } else {
+                boolean detected = intent.getBooleanExtra("detected", true);
+                if (detected)
+                    handler.sendEmptyMessage(eventType);
+            }
         }
     };
 
@@ -177,8 +180,7 @@ private void initSetupLayout() {
         preferences = new PreferenceManager(getApplicationContext());
         setContentView(R.layout.activity_monitor);
 
-        txtTimer = (TextView) findViewById(R.id.timer_text);
-        View viewTimer = findViewById(R.id.timer_container);
+        txtTimer = findViewById(R.id.timer_text);
 
         int timeM = preferences.getTimerDelay() * 1000;
 
@@ -233,8 +235,6 @@ private void initSetupLayout() {
     }
 
     private void configCamera() {
-
-        mFragmentCamera.stopCamera();
         startActivityForResult(new Intent(this, CameraConfigureActivity.class),REQUEST_CAMERA);
     }
 
@@ -259,8 +259,8 @@ private void doCancel() {
 
         if (mIsMonitoring) {
             mIsMonitoring = false;
-            stopService(new Intent(this, MonitorService.class));
-            finish();
+            showAlertDialog();
+            mFragmentCamera.stopMonitoring();
         } else {
 
             findViewById(R.id.btnStartNow).setVisibility(View.VISIBLE);
@@ -313,17 +313,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         }
         else if (requestCode == REQUEST_CAMERA)
         {
-            mFragmentCamera.initCamera();
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        if (!mIsMonitoring)
-        {
-            mFragmentCamera.stopCamera();
+//            mFragmentCamera.initCamera();
         }
-        super.onDestroy();
     }
 
     private void initTimer() {
@@ -475,4 +466,17 @@ public void onTimeSet(TimePickerDialog view, int hourOfDay, int minute, int seco
         updateTimerValue(delaySeconds);
     }
 
+    private void showAlertDialog() {
+        progressDialog = new ProgressDialog(this);
+        progressDialog.setMessage(getString(R.string.finishing_up));
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+    }
+
+    private void notifyMonitoringEnded() {
+        if (progressDialog != null && progressDialog.isShowing()) {
+            progressDialog.dismiss();
+        }
+        finish();
+    }
 }

src/main/java/org/havenapp/main/PreferenceManager.java

@@ -29,6 +29,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import org.havenapp.main.sensors.motion.LuminanceMotionDetector;
+import org.havenapp.main.storage.SharedPreferenceStringLiveData;
 
 import java.io.File;
 import java.util.Date;
@@ -70,6 +71,7 @@ public class PreferenceManager {
     public static final String VERIFY_SIGNAL = "verify_signal";
     public static final String VOICE_VERIFY_SIGNAL = "voice_verify_signal";
     public static final String RESET_SIGNAL_CONFIG = "reset_signal_config";
+    public static final String SIMULTANEOUS_IMAGE_MONITORING = "simultaneous_image_monitoring";
     private static final String UNLOCK_CODE="unlock_code";
 
     private static final String ACCESS_TOKEN="access_token";
@@ -237,6 +239,15 @@ public boolean getVideoMonitoringActive() {
         return appSharedPrefs.getBoolean(context.getResources().getString(R.string.video_active_preference_key), false);
     }
 
+    public void setSimultaneousImageMonitoring(boolean active) {
+        prefsEditor.putBoolean(SIMULTANEOUS_IMAGE_MONITORING, active);
+        prefsEditor.commit();
+    }
+
+    public boolean isSimultaneousImageMonitoring() {
+        return appSharedPrefs.getBoolean(SIMULTANEOUS_IMAGE_MONITORING, false);
+    }
+
     public void activateCamera(boolean active) {
     	prefsEditor.putBoolean(CAMERA_ACTIVE, active);
     	prefsEditor.commit();
@@ -254,6 +265,11 @@ public void setCamera(String camera) {
     public String getCamera() {
     	return appSharedPrefs.getString(CAMERA, FRONT);
     }
+
+    @NonNull
+    public SharedPreferenceStringLiveData getCameraLiveData() {
+        return new SharedPreferenceStringLiveData(appSharedPrefs, CAMERA, FRONT);
+    }
 
     public void setCameraSensitivity(int sensitivity) {
     	prefsEditor.putInt(CAMERA_SENSITIVITY, sensitivity);

src/main/java/org/havenapp/main/SettingsFragment.java

@@ -9,7 +9,6 @@
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
@@ -25,6 +24,17 @@
 import android.widget.Switch;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.preference.EditTextPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.SwitchPreference;
+
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
 import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
 
@@ -38,16 +48,6 @@
 import java.io.File;
 import java.util.Locale;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.preference.EditTextPreference;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.SwitchPreference;
 import info.guardianproject.netcipher.proxy.OrbotHelper;
 
 
@@ -309,6 +309,11 @@ protected void save() {
 
         preferences.setActivateVideoMonitoring(videoMonitoringActive);
 
+        boolean simultaneousImageMonitoring = ((SwitchPreference) findPreference(
+                PreferenceManager.SIMULTANEOUS_IMAGE_MONITORING)).isChecked();
+
+        preferences.setSimultaneousImageMonitoring(simultaneousImageMonitoring);
+
         boolean remoteNotificationActive =
                 ((SwitchPreference) findPreference(PreferenceManager.REMOTE_NOTIFICATION_ACTIVE)).isChecked();
         preferences.setRemoteNotificationActive(remoteNotificationActive);

src/main/java/org/havenapp/main/sensors/MicrophoneMonitor.java

@@ -102,7 +102,7 @@ public void stop (Context context)
     {
         context.unbindService(mConnection);
         if (microphone != null)
-            microphone.cancel(true);
+            microphone.cancelTask();
     }