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

ensure strings aren't requested when there is no context

n8fr8c9ba5e545df9
diff --git a/src/main/java/org/havenapp/main/ui/CameraFragment.java b/src/main/java/org/havenapp/main/ui/CameraFragment.java
index 5b9ead2..0d2fb6f 100644
--- a/src/main/java/org/havenapp/main/ui/CameraFragment.java
+++ b/src/main/java/org/havenapp/main/ui/CameraFragment.java
@@ -40,6 +40,8 @@ public final class CameraFragment extends Fragment {
private PreferenceManager prefs;
private TextView txtCameraStatus;
+ private boolean isAttached = false;
+
/**
* Handler used to update back the UI after motion detection
*/
@@ -49,7 +51,7 @@ public final class CameraFragment extends Fragment {
public void handleMessage(Message msg) {
super.handleMessage(msg);
- if (!isDetached()) {
+ if (isAttached) {
if (txtCameraStatus != null) {
if (msg.what == EventTrigger.CAMERA) {
@@ -91,6 +93,22 @@ public final class CameraFragment extends Fragment {
}
};
+ @Override
+ public void onDetach() {
+ super.onDetach();
+ isAttached = false;
+ LocalBroadcastManager.getInstance(getContext()).unregisterReceiver(receiver);
+ }
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ isAttached = true;
+ IntentFilter filter = new IntentFilter();
+ filter.addAction("event");
+ LocalBroadcastManager.getInstance(getContext()).registerReceiver(receiver,filter );
+ }
+
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
@@ -118,7 +136,6 @@ public final class CameraFragment extends Fragment {
@Override
public void onPause() {
super.onPause();
- LocalBroadcastManager.getInstance(getContext()).unregisterReceiver(receiver);
}
@Override
@@ -128,9 +145,7 @@ public final class CameraFragment extends Fragment {
cameraViewHolder.setMotionSensitivity(prefs.getCameraSensitivity());
- IntentFilter filter = new IntentFilter();
- filter.addAction("event");
- LocalBroadcastManager.getInstance(getContext()).registerReceiver(receiver,filter );
+
}
public void updateCamera ()