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: remove redundant types and casts
fattire031fef9fde96
diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.javaindex 959af1d..9bb3067 100644--- a/src/main/java/org/havenapp/main/ListActivity.java+++ b/src/main/java/org/havenapp/main/ListActivity.java@@ -17,31 +17,22 @@package org.havenapp.main;-import android.database.sqlite.SQLiteException;-import android.os.Handler;-import android.support.design.widget.FloatingActionButton;-import android.support.v7.app.AppCompatActivity;-import android.support.v7.widget.RecyclerView;---import org.havenapp.main.model.Event;-import org.havenapp.main.model.EventTrigger;-import org.havenapp.main.ui.EventActivity;-import org.havenapp.main.ui.EventAdapter;-import org.havenapp.main.ui.PPAppIntro;--import android.annotation.SuppressLint;import android.content.Intent;+import android.database.sqlite.SQLiteException;import android.graphics.Color;import android.graphics.PorterDuff;import android.graphics.drawable.Drawable;import android.os.Build;import android.os.Bundle;+import android.os.Handler;+import android.support.design.widget.FloatingActionButton;import android.support.design.widget.Snackbar;import android.support.v4.content.ContextCompat;import android.support.v4.graphics.drawable.DrawableCompat;+import android.support.v7.app.AppCompatActivity;import android.support.v7.widget.LinearLayoutManager;+import android.support.v7.widget.RecyclerView;import android.support.v7.widget.Toolbar;import android.support.v7.widget.helper.ItemTouchHelper;import android.util.Log;@@ -52,6 +43,12 @@ import android.view.View;import com.mikepenz.aboutlibraries.Libs;import com.mikepenz.aboutlibraries.LibsBuilder;+import org.havenapp.main.model.Event;+import org.havenapp.main.model.EventTrigger;+import org.havenapp.main.ui.EventActivity;+import org.havenapp.main.ui.EventAdapter;+import org.havenapp.main.ui.PPAppIntro;+import java.io.File;import java.text.SimpleDateFormat;import java.util.ArrayList;@@ -85,9 +82,9 @@ public class ListActivity extends AppCompatActivity {Log.d("Main", "onCreate");preferences = new PreferenceManager(this.getApplicationContext());- recyclerView = (RecyclerView) findViewById(R.id.main_list);- fab = (FloatingActionButton) findViewById(R.id.fab);- toolbar = (Toolbar) findViewById(R.id.toolbar);+ recyclerView = findViewById(R.id.main_list);+ fab = findViewById(R.id.fab);+ toolbar = findViewById(R.id.toolbar);setSupportActionBar(toolbar);LinearLayoutManager llm = new LinearLayoutManager(this);diff --git a/src/main/java/org/havenapp/main/MonitorActivity.java b/src/main/java/org/havenapp/main/MonitorActivity.javaindex 257701b..a922d8a 100644--- a/src/main/java/org/havenapp/main/MonitorActivity.java+++ b/src/main/java/org/havenapp/main/MonitorActivity.java@@ -35,18 +35,17 @@ import android.widget.LinearLayout;import android.widget.NumberPicker;import android.widget.TextView;+import org.havenapp.main.service.MonitorService;+import org.havenapp.main.ui.AccelConfigureActivity;+import org.havenapp.main.ui.CameraFragment;+import org.havenapp.main.ui.MicrophoneConfigureActivity;+import java.io.File;import java.io.FileOutputStream;import java.io.IOException;import java.util.Locale;import java.util.concurrent.TimeUnit;--import org.havenapp.main.service.MonitorService;-import org.havenapp.main.ui.AccelConfigureActivity;-import org.havenapp.main.ui.CameraFragment;-import org.havenapp.main.ui.MicrophoneConfigureActivity;-public class MonitorActivity extends FragmentActivity {private PreferenceManager preferences = null;@@ -73,7 +72,7 @@ public class MonitorActivity extends FragmentActivity {preferences = new PreferenceManager(getApplicationContext());setContentView(R.layout.activity_monitor);- txtTimer = (TextView)findViewById(R.id.timer_text);+ txtTimer = findViewById(R.id.timer_text);viewTimer = findViewById(R.id.timer_container);int timeM = preferences.getTimerDelay()*1000;diff --git a/src/main/java/org/havenapp/main/SettingsActivity.java b/src/main/java/org/havenapp/main/SettingsActivity.javaindex 70a202c..8620a40 100644--- a/src/main/java/org/havenapp/main/SettingsActivity.java+++ b/src/main/java/org/havenapp/main/SettingsActivity.java@@ -69,7 +69,7 @@ public class SettingsActivity extends AppCompatActivity {setContentView(R.layout.activity_settings);- Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);+ Toolbar toolbar = findViewById(R.id.toolbar);setSupportActionBar(toolbar);preferences = new PreferenceManager(this.getApplicationContext());@@ -85,18 +85,15 @@ public class SettingsActivity extends AppCompatActivity {/*** Checkboxes for enabled app options*/- final CheckBox smsCheck = (CheckBox) this.findViewById(R.id.sms_check);- final CheckBox remoteAccessCheck = (CheckBox) this.findViewById(R.id.remote_access_check);+ final CheckBox smsCheck = this.findViewById(R.id.sms_check);+ final CheckBox remoteAccessCheck = this.findViewById(R.id.remote_access_check);- final EditText phoneNumber = (EditText)- this.findViewById(R.id.phone_number);+ final EditText phoneNumber = this.findViewById(R.id.phone_number);- final EditText remoteAccessOnion = (EditText)- this.findViewById(R.id.remote_access_onion);+ final EditText remoteAccessOnion = this.findViewById(R.id.remote_access_onion);- remoteAccessCredential = (EditText)- this.findViewById(R.id.remote_access_credential);+ remoteAccessCredential = this.findViewById(R.id.remote_access_credential);smsCheck.setOnCheckedChangeListener(new OnCheckedChangeListener() {@@ -202,10 +199,10 @@ public class SettingsActivity extends AppCompatActivity {{if (preferences.getSignalUsername() != null){- TextView tv = (TextView)findViewById(R.id.label_signal_status);+ TextView tv = findViewById(R.id.label_signal_status);tv.setText("Current Signal Number: " + preferences.getSignalUsername());- Button btnTestSignal = (Button)findViewById(R.id.action_test_signal);+ Button btnTestSignal = findViewById(R.id.action_test_signal);btnTestSignal.setVisibility(View.VISIBLE);btnTestSignal.setOnClickListener(new View.OnClickListener() {@Override@@ -254,11 +251,10 @@ public class SettingsActivity extends AppCompatActivity {private void save (){- EditText phoneNumber = (EditText)- this.findViewById(R.id.phone_number);+ EditText phoneNumber = this.findViewById(R.id.phone_number);- CheckBox smsCheck = (CheckBox) this.findViewById(R.id.sms_check);- CheckBox remoteAccessCheck = (CheckBox) this.findViewById(R.id.remote_access_check);+ CheckBox smsCheck = this.findViewById(R.id.sms_check);+ CheckBox remoteAccessCheck = this.findViewById(R.id.remote_access_check);preferences.activateAccelerometer(true);@@ -332,8 +328,7 @@ public class SettingsActivity extends AppCompatActivity {if (!TextUtils.isEmpty(onionHost)) {preferences.setRemoteAccessOnion(onionHost);- final EditText remoteAccessOnion = (EditText)- this.findViewById(R.id.remote_access_onion);+ final EditText remoteAccessOnion = this.findViewById(R.id.remote_access_onion);remoteAccessOnion.setText(onionHost + ":" + WebServer.LOCAL_PORT);}diff --git a/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java b/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.javaindex 623b0b5..89ec0e5 100644--- a/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java+++ b/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java@@ -84,7 +84,7 @@ public class AccelerometerMonitor implements SensorEventListener {MonitorService.class), mConnection, Context.BIND_ABOVE_CLIENT);sensorMgr = (SensorManager) context.getSystemService(Activity.SENSOR_SERVICE);- accelerometer = (Sensor) sensorMgr.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);+ accelerometer = sensorMgr.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);if (accelerometer == null) {Log.i("AccelerometerFrament", "Warning: no accelerometer");diff --git a/src/main/java/org/havenapp/main/sensors/AmbientLightMonitor.java b/src/main/java/org/havenapp/main/sensors/AmbientLightMonitor.javaindex 0e99e7e..88abda0 100644--- a/src/main/java/org/havenapp/main/sensors/AmbientLightMonitor.java+++ b/src/main/java/org/havenapp/main/sensors/AmbientLightMonitor.java@@ -66,6 +66,7 @@ public class AmbientLightMonitor implements SensorEventListener {MonitorService.class), mConnection, Context.BIND_ABOVE_CLIENT);sensorMgr = (SensorManager) context.getSystemService(Activity.SENSOR_SERVICE);+ //noinspection RedundantCastsensor = (Sensor) sensorMgr.getDefaultSensor(Sensor.TYPE_LIGHT);if (sensor == null) {diff --git a/src/main/java/org/havenapp/main/sensors/BarometerMonitor.java b/src/main/java/org/havenapp/main/sensors/BarometerMonitor.javaindex 0b2ac02..2d66442 100644--- a/src/main/java/org/havenapp/main/sensors/BarometerMonitor.java+++ b/src/main/java/org/havenapp/main/sensors/BarometerMonitor.java@@ -72,7 +72,7 @@ public class BarometerMonitor implements SensorEventListener {MonitorService.class), mConnection, Context.BIND_ABOVE_CLIENT);sensorMgr = (SensorManager) context.getSystemService(Activity.SENSOR_SERVICE);- sensor = (Sensor) sensorMgr.getDefaultSensor(Sensor.TYPE_PRESSURE);+ sensor = sensorMgr.getDefaultSensor(Sensor.TYPE_PRESSURE);if (sensor == null) {Log.i("Pressure", "Warning: no barometer sensor");diff --git a/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java b/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.javaindex 1e402bb..85629d2 100644--- a/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java+++ b/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java@@ -74,15 +74,15 @@ public class AccelConfigureActivity extends AppCompatActivity implements SensorEsuper.onCreate(savedInstanceState);setContentView(R.layout.activity_accel_configure);- Toolbar toolbar = (Toolbar)findViewById(R.id.toolbar);+ Toolbar toolbar = findViewById(R.id.toolbar);setSupportActionBar(toolbar);setTitle("");getSupportActionBar().setDisplayHomeAsUpEnabled(true);- mTextLevel = (TextView)findViewById(R.id.text_display_level);- mNumberTrigger = (ActualNumberPicker)findViewById(R.id.number_trigger_level);- mWaveform = (SimpleWaveformExtended)findViewById(R.id.simplewaveform);+ mTextLevel = findViewById(R.id.text_display_level);+ mNumberTrigger = findViewById(R.id.number_trigger_level);+ mWaveform = findViewById(R.id.simplewaveform);mWaveform.setMaxVal(MAX_SLIDER_VALUE);mNumberTrigger.setMinValue(0);@@ -179,7 +179,7 @@ public class AccelConfigureActivity extends AppCompatActivity implements SensorEtry {SensorManager sensorMgr = (SensorManager) getSystemService(Activity.SENSOR_SERVICE);- Sensor sensor = (Sensor) sensorMgr.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);+ Sensor sensor = sensorMgr.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);if (sensor == null) {Log.i("AccelerometerFrament", "Warning: no accelerometer");@@ -245,7 +245,7 @@ public class AccelConfigureActivity extends AppCompatActivity implements SensorE}mWaveform.refresh();- mTextLevel.setText(getString(R.string.current_accel_base) + ' ' + ((int)speed));+ mTextLevel.setText(getString(R.string.current_accel_base) + ' ' + speed);diff --git a/src/main/java/org/havenapp/main/ui/CameraFragment.java b/src/main/java/org/havenapp/main/ui/CameraFragment.javaindex e4ab2c6..753a5c4 100644--- a/src/main/java/org/havenapp/main/ui/CameraFragment.java+++ b/src/main/java/org/havenapp/main/ui/CameraFragment.java@@ -77,7 +77,7 @@ public final class CameraFragment extends Fragment {((FrameLayout) getActivity().findViewById(R.id.preview)).addView(preview);// oldImage = (ImageView) getActivity().findViewById(R.id.old_image);- newImage = (ImageView) getActivity().findViewById(R.id.new_image);+ newImage = getActivity().findViewById(R.id.new_image);preview.addListener(new MotionAsyncTask.MotionListener() {diff --git a/src/main/java/org/havenapp/main/ui/CustomSlideBigText.java b/src/main/java/org/havenapp/main/ui/CustomSlideBigText.javaindex 29c5a07..b8d3a16 100644--- a/src/main/java/org/havenapp/main/ui/CustomSlideBigText.java+++ b/src/main/java/org/havenapp/main/ui/CustomSlideBigText.java@@ -64,7 +64,7 @@ public class CustomSlideBigText extends Fragment {if (mButtonText != null){- Button button = (Button)view.findViewById(R.id.custom_slide_button);+ Button button = view.findViewById(R.id.custom_slide_button);button.setVisibility(View.VISIBLE);button.setText(mButtonText);button.setOnClickListener(mButtonListener);diff --git a/src/main/java/org/havenapp/main/ui/CustomSlideNotify.java b/src/main/java/org/havenapp/main/ui/CustomSlideNotify.javaindex 04515d3..574d693 100644--- a/src/main/java/org/havenapp/main/ui/CustomSlideNotify.java+++ b/src/main/java/org/havenapp/main/ui/CustomSlideNotify.java@@ -58,7 +58,7 @@ public class CustomSlideNotify extends Fragment {@Nullable Bundle savedInstanceState) {View view = inflater.inflate(layoutResId, container, false);- mEditNumber = (EditText)view.findViewById(R.id.editNumber);+ mEditNumber = view.findViewById(R.id.editNumber);mEditNumber.setOnClickListener(new View.OnClickListener() {@Overridepublic void onClick(View v) {@@ -71,7 +71,7 @@ public class CustomSlideNotify extends Fragment {if (!TextUtils.isEmpty(pm.getSmsNumber()))mEditNumber.setText(pm.getSmsNumber());- Button button = (Button)view.findViewById(R.id.btnSaveNumber);+ Button button = view.findViewById(R.id.btnSaveNumber);button.setOnClickListener(mListener);return view;diff --git a/src/main/java/org/havenapp/main/ui/EventActivity.java b/src/main/java/org/havenapp/main/ui/EventActivity.javaindex 861016b..e1bc121 100644--- a/src/main/java/org/havenapp/main/ui/EventActivity.java+++ b/src/main/java/org/havenapp/main/ui/EventActivity.java@@ -34,7 +34,7 @@ public class EventActivity extends AppCompatActivity {super.onCreate(savedInstanceState);setContentView(R.layout.activity_event);- Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);+ Toolbar toolbar = findViewById(R.id.toolbar);setSupportActionBar(toolbar);StrictMode.setVmPolicy(StrictMode.VmPolicy.LAX);@@ -44,7 +44,7 @@ public class EventActivity extends AppCompatActivity {if (eventId != -1) {mEvent = Event.findById(Event.class, eventId);- mRecyclerView = (RecyclerView)findViewById(R.id.event_trigger_list);+ mRecyclerView = findViewById(R.id.event_trigger_list);setTitle(mEvent.getStartTime().toLocaleString());@@ -54,7 +54,7 @@ public class EventActivity extends AppCompatActivity {mRecyclerView.setLayoutManager(llm);mRecyclerView.setAdapter(mAdapter);- FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);+ FloatingActionButton fab = findViewById(R.id.fab);fab.setOnClickListener(new View.OnClickListener() {@Overridepublic void onClick(View view) {diff --git a/src/main/java/org/havenapp/main/ui/EventAdapter.java b/src/main/java/org/havenapp/main/ui/EventAdapter.javaindex 0adacba..3949473 100644--- a/src/main/java/org/havenapp/main/ui/EventAdapter.java+++ b/src/main/java/org/havenapp/main/ui/EventAdapter.java@@ -7,11 +7,11 @@ import android.view.View;import android.view.ViewGroup;import android.widget.TextView;-import java.util.List;-import org.havenapp.main.R;import org.havenapp.main.model.Event;+import java.util.List;+/*** Created by n8fr8 on 4/16/17.*/@@ -61,8 +61,8 @@ public class EventAdapter extends RecyclerView.Adapter<EventAdapter.EventVH> {public EventVH(View itemView) {super(itemView);- title = (TextView) itemView.findViewById(R.id.event_item_title);- note = (TextView) itemView.findViewById(R.id.event_item_desc);+ title = itemView.findViewById(R.id.event_item_title);+ note = itemView.findViewById(R.id.event_item_desc);itemView.setOnClickListener(this);}diff --git a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.javaindex d3145a4..c597ecc 100644--- a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java@@ -199,11 +199,11 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdaptepublic EventTriggerVH(View itemView) {super(itemView);- title = (TextView) itemView.findViewById(R.id.event_item_title);- note = (TextView) itemView.findViewById(R.id.event_item_desc);- image = (ImageView) itemView.findViewById(R.id.event_item_image);- extra = (ViewGroup)itemView.findViewById(R.id.event_item_extra);- sound = (SimpleWaveformView) itemView.findViewById(R.id.event_item_sound);+ title = itemView.findViewById(R.id.event_item_title);+ note = itemView.findViewById(R.id.event_item_desc);+ image = itemView.findViewById(R.id.event_item_image);+ extra = itemView.findViewById(R.id.event_item_extra);+ sound = itemView.findViewById(R.id.event_item_sound);itemView.setOnClickListener(this);}diff --git a/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java b/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.javaindex c91ade1..af4bb37 100644--- a/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java+++ b/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java@@ -44,15 +44,15 @@ public class MicrophoneConfigureActivity extends AppCompatActivity implements Misuper.onCreate(savedInstanceState);setContentView(R.layout.activity_microphone_configure);- Toolbar toolbar = (Toolbar)findViewById(R.id.toolbar);+ Toolbar toolbar = findViewById(R.id.toolbar);setSupportActionBar(toolbar);setTitle("");getSupportActionBar().setDisplayHomeAsUpEnabled(true);- mTextLevel = (TextView)findViewById(R.id.text_display_level);- mNumberTrigger = (ActualNumberPicker)findViewById(R.id.number_trigger_level);- mWaveform = (SimpleWaveformExtended)findViewById(R.id.simplewaveform);+ mTextLevel = findViewById(R.id.text_display_level);+ mNumberTrigger = findViewById(R.id.number_trigger_level);+ mWaveform = findViewById(R.id.simplewaveform);mWaveform.setMaxVal(MAX_SLIDER_VALUE);mNumberTrigger.setMinValue(0);@@ -241,7 +241,7 @@ public class MicrophoneConfigureActivity extends AppCompatActivity implements Mi}int perc = (int)((averageDB/160d)*100d);- mWaveAmpList.addFirst((int) perc);+ mWaveAmpList.addFirst(perc);if (mWaveAmpList.size() > mWaveform.width / mWaveform.barGap + 2) {mWaveAmpList.removeLast();