Skip to content

armgit / haven

Public Imported from GitHub
0

Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors

camera switch fixes for #238

n8fr888432edb598e
diff --git a/src/main/java/org/havenapp/main/MonitorActivity.java b/src/main/java/org/havenapp/main/MonitorActivity.java
index de5883e..3df6d6e 100644
--- a/src/main/java/org/havenapp/main/MonitorActivity.java
+++ b/src/main/java/org/havenapp/main/MonitorActivity.java
@@ -35,6 +35,7 @@ import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
import org.havenapp.main.service.MonitorService;
import org.havenapp.main.ui.AccelConfigureActivity;
+import org.havenapp.main.ui.CameraConfigureActivity;
import org.havenapp.main.ui.CameraFragment;
import org.havenapp.main.ui.MicrophoneConfigureActivity;
@@ -56,6 +57,11 @@ public class MonitorActivity extends AppCompatActivity implements TimePickerDial
private boolean mIsInitializedLayout = false;
private boolean mOnTimerTicking = false;
+ private final static int REQUEST_CAMERA = 999;
+ private final static int REQUEST_TIMER = 1000;
+
+ private CameraFragment mFragmentCamera;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -148,7 +154,7 @@ public class MonitorActivity extends AppCompatActivity implements TimePickerDial
findViewById(R.id.btnCameraSwitch).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- switchCamera();
+ configCamera();
}
});
@@ -159,11 +165,16 @@ public class MonitorActivity extends AppCompatActivity implements TimePickerDial
}
});
+ mFragmentCamera = ((CameraFragment) getSupportFragmentManager().findFragmentById(R.id.fragment_camera));
+
mIsInitializedLayout = true;
}
- private void switchCamera() {
+ private void configCamera() {
+ mFragmentCamera.stopCamera();
+ startActivityForResult(new Intent(this, CameraConfigureActivity.class),REQUEST_CAMERA);
+ /**
String camera = preferences.getCamera();
if (camera.equals(PreferenceManager.FRONT))
preferences.setCamera(PreferenceManager.BACK);
@@ -171,9 +182,12 @@ public class MonitorActivity extends AppCompatActivity implements TimePickerDial
preferences.setCamera(PreferenceManager.FRONT);
((CameraFragment) getSupportFragmentManager().findFragmentById(R.id.fragment_camera)).resetCamera();
+ **/
}
+
+
private void updateTimerValue(int val) {
preferences.setTimerDelay(val);
int valM = val * 1000;
@@ -212,7 +226,7 @@ public class MonitorActivity extends AppCompatActivity implements TimePickerDial
if (cTimer != null) {
cTimer.cancel();
cTimer = null;
- startActivityForResult(i, 9999);
+ startActivityForResult(i, REQUEST_TIMER);
} else {
startActivity(i);
@@ -224,9 +238,22 @@ public class MonitorActivity extends AppCompatActivity implements TimePickerDial
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
- if (requestCode == 9999) {
+ if (requestCode == REQUEST_TIMER) {
initTimer();
}
+ else if (requestCode == REQUEST_CAMERA)
+ {
+ mFragmentCamera.resetCamera();
+ }
+ }
+
+ @Override
+ protected void onDestroy() {
+ if (!mIsMonitoring)
+ {
+ mFragmentCamera.stopCamera();
+ }
+ super.onDestroy();
}
private void initTimer() {
diff --git a/src/main/java/org/havenapp/main/sensors/motion/Preview.java b/src/main/java/org/havenapp/main/sensors/motion/Preview.java
index 71856a2..17ef545 100644
--- a/src/main/java/org/havenapp/main/sensors/motion/Preview.java
+++ b/src/main/java/org/havenapp/main/sensors/motion/Preview.java
@@ -86,8 +86,13 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
* Messenger used to signal motion to the alert service
*/
private Messenger serviceMessenger = null;
-
- private ServiceConnection mConnection = new ServiceConnection() {
+
+ private SurfaceHolder mHolder;
+ private Camera camera;
+ private Context context;
+ private MotionAsyncTask task;
+
+ private ServiceConnection mConnection = new ServiceConnection() {
public void onServiceConnected(ComponentName className,
IBinder service) {
@@ -102,12 +107,6 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
}
};
-
- private SurfaceHolder mHolder;
- private Camera camera;
- private Context context;
- private MotionAsyncTask task;
-
public Preview (Context context) {
super(context);
this.context = context;
diff --git a/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java b/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java
index f31d3c7..dd60ff4 100644
--- a/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java
+++ b/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java
@@ -82,6 +82,7 @@ public class CameraConfigureActivity extends AppCompatActivity {
public void onValueChanged(int oldValue, int newValue) {
mFragment.setMotionSensitivity(newValue);
mPrefManager.setCameraSensitivity(newValue);
+ setResult(RESULT_OK);
}
});
mIsInitializedLayout = true;
@@ -96,7 +97,7 @@ public class CameraConfigureActivity extends AppCompatActivity {
mPrefManager.setCamera(PreferenceManager.FRONT);
((CameraFragment) getSupportFragmentManager().findFragmentById(R.id.fragment_camera)).resetCamera();
-
+ setResult(RESULT_OK);
}
@@ -105,17 +106,20 @@ public class CameraConfigureActivity extends AppCompatActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
+ mFragment.stopCamera();
finish();
break;
}
return true;
}
+
/**
* When user closes the activity
*/
@Override
public void onBackPressed() {
+ mFragment.stopCamera();
finish();
}
diff --git a/src/main/java/org/havenapp/main/ui/CameraFragment.java b/src/main/java/org/havenapp/main/ui/CameraFragment.java
index 5ac2b59..df146a9 100644
--- a/src/main/java/org/havenapp/main/ui/CameraFragment.java
+++ b/src/main/java/org/havenapp/main/ui/CameraFragment.java
@@ -59,10 +59,18 @@ public final class CameraFragment extends Fragment {
initCamera ();
}
+ public void stopCamera ()
+ {
+ if (preview != null) {
+ preview.stopCamera();
+ preview = null;
+ }
+ }
+
public void resetCamera ()
{
+ stopCamera();
((FrameLayout) getActivity().findViewById(R.id.preview)).removeAllViews();
- preview = null;
initCamera();
}
@@ -87,6 +95,10 @@ public final class CameraFragment extends Fragment {
boolean motionDetected) {
int rotation = 0;
boolean reflex = false;
+
+ if (preview == null)
+ return;
+
if (preview.getCameraFacing() == Camera.CameraInfo.CAMERA_FACING_BACK) {
rotation = 90;
} else {
@@ -105,8 +117,6 @@ public final class CameraFragment extends Fragment {
@Override
public void onDestroy() {
super.onDestroy();
-
- preview.stopCamera();
}
public void onSensorChanged(SensorEvent event) {
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ed64218..9ed7b27 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -135,7 +135,7 @@
<string name="notification_time_dialog">Enter time (minutes) to limit notifications. \'0\' to send every notification.</string>
<string name="minutes">minutes(s)</string>
<string name="keep_watch">Keep Watch!</string>
- <string name="camera_sensitivity_tip">Select camera and use the slider to adjust motion detection sensitivity</string>
+ <string name="camera_sensitivity_tip">Switch camera or use the slider to adjust motion detection sensitivity</string>
<string name="disable_battery_opt_title">Disable Battery Optimizations</string>
<string name="disable_battery_opt_summary">Allow app to run when screen is off</string>