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

Lint: replace complex if with switch statement + Fix EventTrigger bug

fattirea401745e6337
diff --git a/src/main/java/org/havenapp/main/SettingsActivity.java b/src/main/java/org/havenapp/main/SettingsActivity.java
index a5d5b84..70a202c 100644
--- a/src/main/java/org/havenapp/main/SettingsActivity.java
+++ b/src/main/java/org/havenapp/main/SettingsActivity.java
@@ -18,15 +18,12 @@
package org.havenapp.main;
-import java.io.File;
-import java.util.ArrayList;
-
import android.Manifest;
import android.content.DialogInterface;
import android.content.Intent;
+import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.Environment;
-import android.content.pm.PackageManager;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog;
@@ -42,22 +39,24 @@ import android.view.View;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.CompoundButton;
-import android.widget.EditText;
import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.NumberPicker;
import android.widget.RadioButton;
import android.widget.TextView;
import android.widget.Toast;
-
-import info.guardianproject.netcipher.proxy.OrbotHelper;
-
import org.havenapp.main.service.SignalSender;
import org.havenapp.main.service.WebServer;
import org.havenapp.main.ui.AccelConfigureActivity;
import org.havenapp.main.ui.MicrophoneConfigureActivity;
+import java.io.File;
+import java.util.ArrayList;
+
+import info.guardianproject.netcipher.proxy.OrbotHelper;
+
public class SettingsActivity extends AppCompatActivity {
private PreferenceManager preferences = null;
@@ -127,12 +126,17 @@ public class SettingsActivity extends AppCompatActivity {
if (preferences.getCameraActivation()) {
String camera = preferences.getCamera();
- if (camera.equals(PreferenceManager.FRONT))
- ((RadioButton) findViewById(R.id.radio_camera_front)).setChecked(true);
- else if (camera.equals(PreferenceManager.BACK))
- ((RadioButton) findViewById(R.id.radio_camera_back)).setChecked(true);
- else if (camera.equals(PreferenceManager.OFF))
- ((RadioButton) findViewById(R.id.radio_camera_none)).setChecked(true);
+ switch (camera) {
+ case PreferenceManager.FRONT:
+ ((RadioButton) findViewById(R.id.radio_camera_front)).setChecked(true);
+ break;
+ case PreferenceManager.BACK:
+ ((RadioButton) findViewById(R.id.radio_camera_back)).setChecked(true);
+ break;
+ case PreferenceManager.OFF:
+ ((RadioButton) findViewById(R.id.radio_camera_none)).setChecked(true);
+ break;
+ }
}
diff --git a/src/main/java/org/havenapp/main/model/EventTrigger.java b/src/main/java/org/havenapp/main/model/EventTrigger.java
index ea1654c..4f495c7 100644
--- a/src/main/java/org/havenapp/main/model/EventTrigger.java
+++ b/src/main/java/org/havenapp/main/model/EventTrigger.java
@@ -38,21 +38,21 @@ public class EventTrigger extends SugarRecord {
/**
* Pressure change detected message
*/
- public static final int PRESSURE = 2;
+ public static final int PRESSURE = 3;
/**
* Light change detected message
*/
- public static final int LIGHT = 3;
+ public static final int LIGHT = 4;
/**
* Power change detected message
*/
- public static final int POWER = 4;
+ public static final int POWER = 5;
/**
* Significant motion detected message
*/
- public static final int BUMP = 5;
+ public static final int BUMP = 6;
public EventTrigger ()
diff --git a/src/main/java/org/havenapp/main/sensors/MicrophoneMonitor.java b/src/main/java/org/havenapp/main/sensors/MicrophoneMonitor.java
index 3321920..aa44e90 100644
--- a/src/main/java/org/havenapp/main/sensors/MicrophoneMonitor.java
+++ b/src/main/java/org/havenapp/main/sensors/MicrophoneMonitor.java
@@ -66,18 +66,20 @@ public final class MicrophoneMonitor implements MicSamplerTask.MicListener {
prefs = new PreferenceManager(context);
- if (prefs.getMicrophoneSensitivity().equals("High")) {
- mNoiseThreshold = 40;
- } else if (prefs.getMicrophoneSensitivity().equals("Medium")) {
- mNoiseThreshold = 60;
- }
- else
- {
- try {
- //maybe it is a threshold value?
- mNoiseThreshold = Double.parseDouble(prefs.getMicrophoneSensitivity());
- }
- catch (Exception e){}
+ switch (prefs.getMicrophoneSensitivity()) {
+ case "High":
+ mNoiseThreshold = 40;
+ break;
+ case "Medium":
+ mNoiseThreshold = 60;
+ break;
+ default:
+ try {
+ //maybe it is a threshold value?
+ mNoiseThreshold = Double.parseDouble(prefs.getMicrophoneSensitivity());
+ } catch (Exception e) {
+ }
+ break;
}
context.bindService(new Intent(context,
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 95e259b..f3fc62e 100644
--- a/src/main/java/org/havenapp/main/sensors/motion/Preview.java
+++ b/src/main/java/org/havenapp/main/sensors/motion/Preview.java
@@ -118,15 +118,19 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
/*
* Set sensitivity value
*/
- if (prefs.getCameraSensitivity().equals("Medium")) {
- motionSensitivity = LuminanceMotionDetector.MOTION_MEDIUM;
- Log.i("CameraFragment", "Sensitivity set to Medium");
- } else if (prefs.getCameraSensitivity().equals("Low")) {
- motionSensitivity = LuminanceMotionDetector.MOTION_LOW;
- Log.i("CameraFragment", "Sensitivity set to Low");
- } else {
- motionSensitivity = LuminanceMotionDetector.MOTION_HIGH;
- Log.i("CameraFragment", "Sensitivity set to High");
+ switch (prefs.getCameraSensitivity()) {
+ case "Medium":
+ motionSensitivity = LuminanceMotionDetector.MOTION_MEDIUM;
+ Log.i("CameraFragment", "Sensitivity set to Medium");
+ break;
+ case "Low":
+ motionSensitivity = LuminanceMotionDetector.MOTION_LOW;
+ Log.i("CameraFragment", "Sensitivity set to Low");
+ break;
+ default:
+ motionSensitivity = LuminanceMotionDetector.MOTION_HIGH;
+ Log.i("CameraFragment", "Sensitivity set to High");
+ break;
}
}
@@ -154,28 +158,30 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
* to draw.
* If the selected camera is the front one we open it
*/
- if (prefs.getCamera().equals(PreferenceManager.FRONT)) {
- Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
- int cameraCount = Camera.getNumberOfCameras();
- for (int camIdx = 0; camIdx < cameraCount; camIdx++) {
- Camera.getCameraInfo(camIdx, cameraInfo);
- if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
- try {
- camera = Camera.open(camIdx);
- cameraFacing = Camera.CameraInfo.CAMERA_FACING_FRONT;
- } catch (RuntimeException e) {
- Log.e("Preview", "Camera failed to open: " + e.getLocalizedMessage());
+ switch (prefs.getCamera()) {
+ case PreferenceManager.FRONT:
+ Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
+ int cameraCount = Camera.getNumberOfCameras();
+ for (int camIdx = 0; camIdx < cameraCount; camIdx++) {
+ Camera.getCameraInfo(camIdx, cameraInfo);
+ if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+ try {
+ camera = Camera.open(camIdx);
+ cameraFacing = Camera.CameraInfo.CAMERA_FACING_FRONT;
+ } catch (RuntimeException e) {
+ Log.e("Preview", "Camera failed to open: " + e.getLocalizedMessage());
+ }
}
}
- }
- } else if (prefs.getCamera().equals(PreferenceManager.BACK)) {
-
- camera = Camera.open();
- cameraFacing = Camera.CameraInfo.CAMERA_FACING_BACK;
- }
- else
- {
- camera = null;
+ break;
+ case PreferenceManager.BACK:
+
+ camera = Camera.open();
+ cameraFacing = Camera.CameraInfo.CAMERA_FACING_BACK;
+ break;
+ default:
+ camera = null;
+ break;
}
if (camera != null) {
diff --git a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
index 55ca12b..d3145a4 100644
--- a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
@@ -74,96 +74,90 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
if (eventTrigger.getPath() != null)
{
- if (eventTrigger.getType() == EventTrigger.CAMERA)
- {
- holder.image.setVisibility(View.VISIBLE);
- Picasso.with(context).load(new File(eventTrigger.getPath())).into(holder.image);
- holder.image.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
-
- int startPosition = 0;
- for (int i = 0; i < eventTriggerImagePaths.size(); i++)
- {
- if (eventTriggerImagePaths.get(i).contains(eventTrigger.getPath()))
- {
- startPosition = i;
- break;
+ switch (eventTrigger.getType()) {
+ case EventTrigger.CAMERA:
+ holder.image.setVisibility(View.VISIBLE);
+ Picasso.with(context).load(new File(eventTrigger.getPath())).into(holder.image);
+ holder.image.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+
+ int startPosition = 0;
+ for (int i = 0; i < eventTriggerImagePaths.size(); i++) {
+ if (eventTriggerImagePaths.get(i).contains(eventTrigger.getPath())) {
+ startPosition = i;
+ break;
+ }
}
- }
- ShareOverlayView overlayView = new ShareOverlayView(context);
- ImageViewer viewer = new ImageViewer.Builder(context, eventTriggerImagePaths)
- .setStartPosition(startPosition)
- .setOverlayView(overlayView)
- .show();
- overlayView.setImageViewer(viewer);
+ ShareOverlayView overlayView = new ShareOverlayView(context);
+ ImageViewer viewer = new ImageViewer.Builder(context, eventTriggerImagePaths)
+ .setStartPosition(startPosition)
+ .setOverlayView(overlayView)
+ .show();
+ overlayView.setImageViewer(viewer);
- }
- });
-
- holder.image.setOnLongClickListener(new View.OnLongClickListener() {
- @Override
- public boolean onLongClick(View view) {
- shareMedia(eventTrigger);
- return false;
- }
- });
- }
- else if (eventTrigger.getType() == EventTrigger.MICROPHONE)
- {
- LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
-
- holder.sound.setVisibility(View.VISIBLE);
- final File fileSound = new File(eventTrigger.getPath());
- try {
- final SoundFile soundFile = SoundFile.create(fileSound.getPath(), new SoundFile.ProgressListener() {
- int lastProgress = 0;
+ }
+ });
+ holder.image.setOnLongClickListener(new View.OnLongClickListener() {
@Override
- public boolean reportProgress(double fractionComplete) {
- final int progress = (int) (fractionComplete * 100);
- if (lastProgress == progress) {
- return true;
- }
- lastProgress = progress;
-
- return true;
+ public boolean onLongClick(View view) {
+ shareMedia(eventTrigger);
+ return false;
}
});
- holder.sound.setAudioFile(soundFile);
- holder.sound.invalidate();
- }
- catch (Exception e){}
+ break;
+ case EventTrigger.MICROPHONE:
+ LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+ holder.sound.setVisibility(View.VISIBLE);
+ final File fileSound = new File(eventTrigger.getPath());
+ try {
+ final SoundFile soundFile = SoundFile.create(fileSound.getPath(), new SoundFile.ProgressListener() {
+ int lastProgress = 0;
+
+ @Override
+ public boolean reportProgress(double fractionComplete) {
+ final int progress = (int) (fractionComplete * 100);
+ if (lastProgress == progress) {
+ return true;
+ }
+ lastProgress = progress;
- holder.extra.setVisibility(View.VISIBLE);
- holder.extra.removeAllViews();
+ return true;
+ }
+ });
+ holder.sound.setAudioFile(soundFile);
+ holder.sound.invalidate();
+ } catch (Exception e) {
+ }
- AudioWife audioWife = new AudioWife();
- audioWife.init(context, Uri.fromFile(fileSound))
- .useDefaultUi(holder.extra, inflater);
+ holder.extra.setVisibility(View.VISIBLE);
+ holder.extra.removeAllViews();
+ AudioWife audioWife = new AudioWife();
+ audioWife.init(context, Uri.fromFile(fileSound))
+ .useDefaultUi(holder.extra, inflater);
- }
- else if (eventTrigger.getType() == EventTrigger.ACCELEROMETER)
- {
- desc += "\n" + context.getString(R.string.data_speed) + ": " + eventTrigger.getPath();
- }
- else if (eventTrigger.getType() == EventTrigger.LIGHT)
- {
- desc += "\n" + context.getString(R.string.data_light) + ": " + eventTrigger.getPath();
+ break;
+ case EventTrigger.ACCELEROMETER:
+ desc += "\n" + context.getString(R.string.data_speed) + ": " + eventTrigger.getPath();
- }
- else if (eventTrigger.getType() == EventTrigger.PRESSURE)
- {
- desc += "\n" + context.getString(R.string.data_pressure) + ": " + eventTrigger.getPath();
- }
- else if (eventTrigger.getType() == EventTrigger.POWER)
- {
- desc += "\n" + context.getString(R.string.data_power) + ": " + eventTrigger.getPath();
+ break;
+ case EventTrigger.LIGHT:
+ desc += "\n" + context.getString(R.string.data_light) + ": " + eventTrigger.getPath();
+
+ break;
+ case EventTrigger.PRESSURE:
+ desc += "\n" + context.getString(R.string.data_pressure) + ": " + eventTrigger.getPath();
+ break;
+ case EventTrigger.POWER:
+ desc += "\n" + context.getString(R.string.data_power) + ": " + eventTrigger.getPath();
+ break;
}
}