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

Clean Up - Ecapsulation

pk-development55582abedaf9
diff --git a/src/main/java/org/havenapp/main/HavenApp.java b/src/main/java/org/havenapp/main/HavenApp.java
index f82b5a9..f4167cc 100644
--- a/src/main/java/org/havenapp/main/HavenApp.java
+++ b/src/main/java/org/havenapp/main/HavenApp.java
@@ -34,9 +34,9 @@ public class HavenApp extends MultiDexApplication {
/*
** Onion-available Web Server for optional remote access
*/
- WebServer mOnionServer = null;
+ private WebServer mOnionServer = null;
- PreferenceManager mPrefs = null;
+ private PreferenceManager mPrefs = null;
@Override
public void onCreate() {
diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.java
index 959af1d..0e24373 100644
--- a/src/main/java/org/havenapp/main/ListActivity.java
+++ b/src/main/java/org/havenapp/main/ListActivity.java
@@ -62,18 +62,18 @@ import java.util.List;
public class ListActivity extends AppCompatActivity {
- RecyclerView recyclerView;
- FloatingActionButton fab;
- Toolbar toolbar;
- EventAdapter adapter;
- List<Event> events = new ArrayList<>();
- PreferenceManager preferences;
+ private RecyclerView recyclerView;
+ private FloatingActionButton fab;
+ private Toolbar toolbar;
+ private EventAdapter adapter;
+ private List<Event> events = new ArrayList<>();
+ private PreferenceManager preferences;
- long initialCount;
+ private long initialCount;
- int modifyPos = -1;
+ private int modifyPos = -1;
- int REQUEST_CODE_INTRO = 1001;
+ private int REQUEST_CODE_INTRO = 1001;
private Handler handler = new Handler();
diff --git a/src/main/java/org/havenapp/main/model/Event.java b/src/main/java/org/havenapp/main/model/Event.java
index 581bc4d..e39a6b9 100644
--- a/src/main/java/org/havenapp/main/model/Event.java
+++ b/src/main/java/org/havenapp/main/model/Event.java
@@ -13,10 +13,10 @@ import java.util.List;
public class Event extends SugarRecord {
- Date mStartTime;
+ private Date mStartTime;
@Ignore
- ArrayList<EventTrigger> mEventTriggers;
+ private ArrayList<EventTrigger> mEventTriggers;
public final static long EVENT_WINDOW_TIME = 1000 * 60 * 5; //1 minutes
diff --git a/src/main/java/org/havenapp/main/model/EventTrigger.java b/src/main/java/org/havenapp/main/model/EventTrigger.java
index ea1654c..64bb798 100644
--- a/src/main/java/org/havenapp/main/model/EventTrigger.java
+++ b/src/main/java/org/havenapp/main/model/EventTrigger.java
@@ -14,11 +14,11 @@ import java.util.Date;
public class EventTrigger extends SugarRecord {
- int mType;
- Date mTime;
- long mEventId;
+ private int mType;
+ private Date mTime;
+ private long mEventId;
- String mPath;
+ private String mPath;
/**
* Acceleration detected message
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 485db27..38b5846 100644
--- a/src/main/java/org/havenapp/main/sensors/motion/Preview.java
+++ b/src/main/java/org/havenapp/main/sensors/motion/Preview.java
@@ -100,10 +100,10 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
serviceMessenger = null;
}
};
-
-
- SurfaceHolder mHolder;
- public Camera camera;
+
+
+ private SurfaceHolder mHolder;
+ private Camera camera;
private Context context;
public Preview (Context context) {
diff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.java
index c2d4602..a0aadbb 100644
--- a/src/main/java/org/havenapp/main/service/MonitorService.java
+++ b/src/main/java/org/havenapp/main/service/MonitorService.java
@@ -55,11 +55,11 @@ public class MonitorService extends Service {
/**
* To show a notification on service start
*/
- NotificationManager manager;
- NotificationChannel mChannel;
- final static String channelId = "monitor_id";
- final static CharSequence channelName = "Haven notifications";
- final static String channelDescription= "Important messages from Haven";
+ private NotificationManager manager;
+ private NotificationChannel mChannel;
+ private final static String channelId = "monitor_id";
+ private final static CharSequence channelName = "Haven notifications";
+ private final static String channelDescription= "Important messages from Haven";
/**
* True only if service has been alerted by the accelerometer
@@ -75,27 +75,27 @@ public class MonitorService extends Service {
/**
* Incrementing alert id
*/
- int mNotificationAlertId = 7007;
+ private int mNotificationAlertId = 7007;
/**
* Sensor Monitors
*/
- AccelerometerMonitor mAccelManager = null;
- BumpMonitor mBumpMonitor = null;
- MicrophoneMonitor mMicMonitor = null;
- BarometerMonitor mBaroMonitor = null;
- AmbientLightMonitor mLightMonitor = null;
+ private AccelerometerMonitor mAccelManager = null;
+ private BumpMonitor mBumpMonitor = null;
+ private MicrophoneMonitor mMicMonitor = null;
+ private BarometerMonitor mBaroMonitor = null;
+ private AmbientLightMonitor mLightMonitor = null;
private boolean mIsRunning = false;
/**
* Last Event instances
*/
- Event mLastEvent;
+ private Event mLastEvent;
/**
* Handler for incoming messages
*/
- class MessageHandler extends Handler {
+ private class MessageHandler extends Handler {
@Override
public void handleMessage(Message msg) {
alert(msg.what,msg.getData().getString("path"));
@@ -110,13 +110,13 @@ public class MonitorService extends Service {
/*
** Helps keep the service awake when screen is off
*/
- PowerManager.WakeLock wakeLock;
+ private PowerManager.WakeLock wakeLock;
/*
**
* Application
*/
- HavenApp mApp = null;
+ private HavenApp mApp = null;
/**
* Called on service creation, sends a notification
@@ -336,10 +336,6 @@ public class MonitorService extends Service {
}
-
-
-
-
}
diff --git a/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java b/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java
index f9bd4f3..5d27dbb 100644
--- a/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java
+++ b/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java
@@ -44,7 +44,7 @@ public class AccelConfigureActivity extends AppCompatActivity implements SensorE
private SimpleWaveformExtended mWaveform;
private LinkedList<Integer> mWaveAmpList;
- static final int MAX_SLIDER_VALUE = 100;
+ private static final int MAX_SLIDER_VALUE = 100;
private double maxAmp = 0;
diff --git a/src/main/java/org/havenapp/main/ui/EventAdapter.java b/src/main/java/org/havenapp/main/ui/EventAdapter.java
index 0adacba..5307246 100644
--- a/src/main/java/org/havenapp/main/ui/EventAdapter.java
+++ b/src/main/java/org/havenapp/main/ui/EventAdapter.java
@@ -18,10 +18,10 @@ import org.havenapp.main.model.Event;
public class EventAdapter extends RecyclerView.Adapter<EventAdapter.EventVH> {
- Context context;
- List<Event> events;
+ private Context context;
+ private List<Event> events;
- OnItemClickListener clickListener;
+ private OnItemClickListener clickListener;
public EventAdapter(Context context, List<Event> events) {
this.context = context;
diff --git a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
index 94bf3e2..332e6bc 100644
--- a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
@@ -29,11 +29,11 @@ import nl.changer.audiowife.AudioWife;
public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapter.EventTriggerVH> {
- Context context;
- List<EventTrigger> eventTriggers;
- ArrayList<String> eventTriggerImagePaths;
+ private Context context;
+ private List<EventTrigger> eventTriggers;
+ private ArrayList<String> eventTriggerImagePaths;
- OnItemClickListener clickListener;
+ private OnItemClickListener clickListener;
public EventTriggerAdapter(Context context, List<EventTrigger> eventTriggers) {
this.context = context;
diff --git a/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java b/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java
index c6fefc4..7a4cf89 100644
--- a/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java
+++ b/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java
@@ -35,7 +35,7 @@ public class MicrophoneConfigureActivity extends AppCompatActivity implements Mi
private PreferenceManager mPrefManager;
private SimpleWaveformExtended mWaveform;
private LinkedList<Integer> mWaveAmpList;
- static final int MAX_SLIDER_VALUE = 120;
+ private static final int MAX_SLIDER_VALUE = 120;
private double maxAmp = 0;
diff --git a/src/main/java/org/havenapp/main/ui/SimpleWaveformExtended.java b/src/main/java/org/havenapp/main/ui/SimpleWaveformExtended.java
index 398faaf..edbae2b 100644
--- a/src/main/java/org/havenapp/main/ui/SimpleWaveformExtended.java
+++ b/src/main/java/org/havenapp/main/ui/SimpleWaveformExtended.java
@@ -14,8 +14,8 @@ public class SimpleWaveformExtended extends SimpleWaveform {
private int mThreshold = 0;
- int lineY;
- int maxVal = 100; // default max value of slider
+ private int lineY;
+ private int maxVal = 100; // default max value of slider
public SimpleWaveformExtended(Context context) {
super(context);