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: Misc fixes (see below) Still not a big cleanup but little bits

fattire54da36dbc418
diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.java
index bec878d..fad9325 100644
--- a/src/main/java/org/havenapp/main/SettingsFragment.java
+++ b/src/main/java/org/havenapp/main/SettingsFragment.java
@@ -19,10 +19,7 @@ import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceFragmentCompat;
import android.support.v7.preference.SwitchPreferenceCompat;
-import android.telephony.SmsManager;
import android.text.TextUtils;
-import android.view.Menu;
-import android.view.MenuInflater;
import android.view.MenuItem;
import android.widget.Toast;
@@ -34,8 +31,6 @@ import org.havenapp.main.ui.AccelConfigureActivity;
import org.havenapp.main.ui.MicrophoneConfigureActivity;
import java.io.File;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
import info.guardianproject.netcipher.proxy.OrbotHelper;
@@ -228,75 +223,87 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
- if (PreferenceManager.CAMERA.equals(key)) {
- switch (Integer.parseInt(((ListPreference) findPreference(PreferenceManager.CAMERA)).getValue())) {
- case 0:
- preferences.setCamera(PreferenceManager.FRONT);
- findPreference(PreferenceManager.CAMERA).setSummary(PreferenceManager.FRONT);
- break;
- case 1:
- preferences.setCamera(PreferenceManager.BACK);
- findPreference(PreferenceManager.CAMERA).setSummary(PreferenceManager.BACK);
- break;
- case 2:
- preferences.setCamera(PreferenceManager.NONE);
- findPreference(PreferenceManager.CAMERA).setSummary(PreferenceManager.NONE);
- break;
+ switch (key) {
+ case PreferenceManager.CAMERA:
+ switch (Integer.parseInt(((ListPreference) findPreference(PreferenceManager.CAMERA)).getValue())) {
+ case 0:
+ preferences.setCamera(PreferenceManager.FRONT);
+ findPreference(PreferenceManager.CAMERA).setSummary(PreferenceManager.FRONT);
+ break;
+ case 1:
+ preferences.setCamera(PreferenceManager.BACK);
+ findPreference(PreferenceManager.CAMERA).setSummary(PreferenceManager.BACK);
+ break;
+ case 2:
+ preferences.setCamera(PreferenceManager.NONE);
+ findPreference(PreferenceManager.CAMERA).setSummary(PreferenceManager.NONE);
+ break;
- }
- } else if (PreferenceManager.SMS_ACTIVE.equals(key)) {
-
- setPhoneNumber();
- } else if (PreferenceManager.REMOTE_ACCESS_ACTIVE.equals(key)) {
- boolean remoteAccessActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.REMOTE_ACCESS_ACTIVE)).isChecked();
- if (remoteAccessActive) {
- checkRemoteAccessOnion();
- app.startServer();
- } else {
- app.stopServer();
- }
- } else if (PreferenceManager.REGISTER_SIGNAL.equals(key)) {
- String signalNum = ((EditTextPreference) findPreference(PreferenceManager.REGISTER_SIGNAL)).getText();
+ }
+ break;
+ case PreferenceManager.SMS_ACTIVE:
- if (checkValidString(signalNum)) {
- signalNum = "+" + signalNum.trim().replaceAll("[^0-9]", "");
+ setPhoneNumber();
+ break;
+ case PreferenceManager.REMOTE_ACCESS_ACTIVE:
+ boolean remoteAccessActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.REMOTE_ACCESS_ACTIVE)).isChecked();
+ if (remoteAccessActive) {
+ checkRemoteAccessOnion();
+ app.startServer();
+ } else {
+ app.stopServer();
+ }
+ break;
+ case PreferenceManager.REGISTER_SIGNAL:
+ String signalNum = ((EditTextPreference) findPreference(PreferenceManager.REGISTER_SIGNAL)).getText();
- preferences.setSignalUsername(signalNum);
- findPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(signalNum);
+ if (checkValidString(signalNum)) {
+ signalNum = "+" + signalNum.trim().replaceAll("[^0-9]", "");
- resetSignal(preferences.getSignalUsername());
- activateSignal(preferences.getSignalUsername(), null);
- } else {
- preferences.setSignalUsername("");
- findPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(R.string.register_signal_desc);
- }
- } else if (PreferenceManager.VERIFY_SIGNAL.equals(key)) {
- String text = ((EditTextPreference) findPreference(PreferenceManager.VERIFY_SIGNAL)).getText();
- activateSignal(preferences.getSignalUsername(), text);
- } else if (PreferenceManager.SMS_NUMBER.equals(key)) {
- boolean smsActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.SMS_ACTIVE)).isChecked();
- if (smsActive && TextUtils.isEmpty(preferences.getSignalUsername())) {
- askForPermission(Manifest.permission.SEND_SMS, 6);
- askForPermission(Manifest.permission.READ_PHONE_STATE, 6);
+ preferences.setSignalUsername(signalNum);
+ findPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(signalNum);
+
+ resetSignal(preferences.getSignalUsername());
+ activateSignal(preferences.getSignalUsername(), null);
+ } else {
+ preferences.setSignalUsername("");
+ findPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(R.string.register_signal_desc);
+ }
+ break;
+ case PreferenceManager.VERIFY_SIGNAL: {
+ String text = ((EditTextPreference) findPreference(PreferenceManager.VERIFY_SIGNAL)).getText();
+ activateSignal(preferences.getSignalUsername(), text);
+ break;
}
- setPhoneNumber();
- } else if (PreferenceManager.REMOTE_ACCESS_ONION.equals(key)) {
- String text = ((EditTextPreference) findPreference(PreferenceManager.REMOTE_ACCESS_ONION)).getText();
- if (checkValidString(text)) {
- preferences.setRemoteAccessOnion(text.trim());
- findPreference(PreferenceManager.REMOTE_ACCESS_ONION).setSummary(preferences.getRemoteAccessOnion().trim() + ":" + WebServer.LOCAL_PORT);
- } else {
- preferences.setRemoteAccessOnion(text);
- findPreference(PreferenceManager.REMOTE_ACCESS_ONION).setSummary(R.string.remote_access_hint);
+ case PreferenceManager.SMS_NUMBER:
+ boolean smsActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.SMS_ACTIVE)).isChecked();
+ if (smsActive && TextUtils.isEmpty(preferences.getSignalUsername())) {
+ askForPermission(Manifest.permission.SEND_SMS, 6);
+ askForPermission(Manifest.permission.READ_PHONE_STATE, 6);
+ }
+ setPhoneNumber();
+ break;
+ case PreferenceManager.REMOTE_ACCESS_ONION: {
+ String text = ((EditTextPreference) findPreference(PreferenceManager.REMOTE_ACCESS_ONION)).getText();
+ if (checkValidString(text)) {
+ preferences.setRemoteAccessOnion(text.trim());
+ findPreference(PreferenceManager.REMOTE_ACCESS_ONION).setSummary(preferences.getRemoteAccessOnion().trim() + ":" + WebServer.LOCAL_PORT);
+ } else {
+ preferences.setRemoteAccessOnion(text);
+ findPreference(PreferenceManager.REMOTE_ACCESS_ONION).setSummary(R.string.remote_access_hint);
+ }
+ break;
}
- } else if (PreferenceManager.REMOTE_ACCESS_CRED.equals(key)) {
- String text = ((EditTextPreference) findPreference(PreferenceManager.REMOTE_ACCESS_CRED)).getText();
- if (checkValidString(text)) {
- preferences.setRemoteAccessCredential(text.trim());
- findPreference(PreferenceManager.REMOTE_ACCESS_CRED).setSummary(preferences.getRemoteAccessCredential().trim());
- } else {
- preferences.setRemoteAccessCredential(text);
- findPreference(PreferenceManager.REMOTE_ACCESS_CRED).setSummary(R.string.remote_access_credential_hint);
+ case PreferenceManager.REMOTE_ACCESS_CRED: {
+ String text = ((EditTextPreference) findPreference(PreferenceManager.REMOTE_ACCESS_CRED)).getText();
+ if (checkValidString(text)) {
+ preferences.setRemoteAccessCredential(text.trim());
+ findPreference(PreferenceManager.REMOTE_ACCESS_CRED).setSummary(preferences.getRemoteAccessCredential().trim());
+ } else {
+ preferences.setRemoteAccessCredential(text);
+ findPreference(PreferenceManager.REMOTE_ACCESS_CRED).setSummary(R.string.remote_access_credential_hint);
+ }
+ break;
}
}
}
diff --git a/src/main/java/org/havenapp/main/sensors/MicrophoneMonitor.java b/src/main/java/org/havenapp/main/sensors/MicrophoneMonitor.java
index ae023f4..48538b5 100644
--- a/src/main/java/org/havenapp/main/sensors/MicrophoneMonitor.java
+++ b/src/main/java/org/havenapp/main/sensors/MicrophoneMonitor.java
@@ -77,7 +77,7 @@ public final class MicrophoneMonitor implements MicSamplerTask.MicListener {
try {
//maybe it is a threshold value?
mNoiseThreshold = Double.parseDouble(prefs.getMicrophoneSensitivity());
- } catch (Exception e) {
+ } catch (Exception ignored) {
}
break;
}
diff --git a/src/main/java/org/havenapp/main/sensors/media/MicSamplerTask.java b/src/main/java/org/havenapp/main/sensors/media/MicSamplerTask.java
index 85e9e6e..ba01ae9 100644
--- a/src/main/java/org/havenapp/main/sensors/media/MicSamplerTask.java
+++ b/src/main/java/org/havenapp/main/sensors/media/MicSamplerTask.java
@@ -10,21 +10,21 @@
package org.havenapp.main.sensors.media;
-import java.io.IOException;
-
import android.os.AsyncTask;
import android.util.Log;
+import java.io.IOException;
+
public class MicSamplerTask extends AsyncTask<Void,Object,Void> {
-
+
private MicListener listener = null;
private AudioCodec volumeMeter = new AudioCodec();
private boolean sampling = true;
private boolean paused = false;
-
- public static interface MicListener {
- public void onSignalReceived(short[] signal);
- public void onMicError();
+
+ public interface MicListener {
+ void onSignalReceived(short[] signal);
+ void onMicError();
}
public void setMicListener(MicListener listener) {
diff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.java
index 28ab3fa..f83def5 100644
--- a/src/main/java/org/havenapp/main/service/MonitorService.java
+++ b/src/main/java/org/havenapp/main/service/MonitorService.java
@@ -59,21 +59,11 @@ public class MonitorService extends Service {
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
- */
- private boolean already_alerted;
/**
* Object used to retrieve shared preferences
*/
private PreferenceManager mPrefs = null;
-
- /**
- * Incrementing alert id
- */
- private int mNotificationAlertId = 7007;
/**
* Sensor Monitors
diff --git a/src/main/java/org/havenapp/main/service/WebServer.java b/src/main/java/org/havenapp/main/service/WebServer.java
index a1da863..870edcf 100644
--- a/src/main/java/org/havenapp/main/service/WebServer.java
+++ b/src/main/java/org/havenapp/main/service/WebServer.java
@@ -58,7 +58,7 @@ public class WebServer extends NanoHTTPD {
{
// We have to use session.parseBody() to obtain POST data.
// See https://github.com/NanoHttpd/nanohttpd/issues/427
- Map<String, String> content = new HashMap<String, String>();
+ Map<String, String> content = new HashMap<>();
Method method = session.getMethod();
if (Method.PUT.equals(method) || Method.POST.equals(method)) try {
session.parseBody(content);
diff --git a/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java b/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java
index c78661f..287b7c5 100644
--- a/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java
+++ b/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java
@@ -11,7 +11,6 @@ import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.view.Menu;
import android.view.MenuItem;
import android.widget.TextView;
@@ -140,15 +139,6 @@ public class MicrophoneConfigureActivity extends AppCompatActivity implements Mi
canvas.drawColor(Color.WHITE, PorterDuff.Mode.CLEAR);
}
};
- /**
- mWaveform.progressTouch = new SimpleWaveform.ProgressTouch() {
- @Override
- public void progressTouch(int progress, MotionEvent event) {
- Log.d("", "you touch at: " + progress);
- mWaveform.firstPartNum = progress;
- mWaveform.refresh();
- }
- };**/
//show...
mWaveform.refresh();
}
@@ -248,7 +238,7 @@ public class MicrophoneConfigureActivity extends AppCompatActivity implements Mi
}
mWaveform.refresh();
- mTextLevel.setText(getString(R.string.current_noise_base) + ' ' + ((int)averageDB)+"db");
+ mTextLevel.setText(getString(R.string.current_noise_base).concat(" ").concat(Integer.toString((int) averageDB)).concat("db"));
}
diff --git a/src/main/res/layout/activity_monitor.xml b/src/main/res/layout/activity_monitor.xml
index ccb3f83..4bda4ce 100644
--- a/src/main/res/layout/activity_monitor.xml
+++ b/src/main/res/layout/activity_monitor.xml
@@ -42,7 +42,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
- android:textSize="78dp"
+ android:textSize="78sp"
android:text="1:00"
android:textStyle="bold"
android:textColor="@color/White"
@@ -57,7 +57,7 @@
android:background="@drawable/round_drawable_accent"
android:id="@+id/btnStartNow"
android:layout_margin="10dp"
- android:textSize="25dp"
+ android:textSize="25sp"
android:padding="6dp"
/>
<Button
diff --git a/src/main/res/layout/camera_fragment.xml b/src/main/res/layout/camera_fragment.xml
index 1c28035..826b00c 100644
--- a/src/main/res/layout/camera_fragment.xml
+++ b/src/main/res/layout/camera_fragment.xml
@@ -5,7 +5,7 @@
android:layout_height="match_parent">
<FrameLayout android:id="@+id/preview"
- android:layout_centerHorizontal="true"
+ android:layout_gravity="center_horizontal"
android:layout_width="1dp"
android:layout_height="1dp">
</FrameLayout>
@@ -14,7 +14,6 @@
android:id="@+id/new_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_below="@id/preview"
/>
diff --git a/src/main/res/layout/custom_slide_notify.xml b/src/main/res/layout/custom_slide_notify.xml
index f0f56cf..257f3b3 100644
--- a/src/main/res/layout/custom_slide_notify.xml
+++ b/src/main/res/layout/custom_slide_notify.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
- android:background="@color/colorPrimaryDark"
- >
+ android:background="@color/colorPrimaryDark">
<TextView
android:id="@+id/custom_slide_big_text"
@@ -18,11 +18,12 @@
android:textStyle="bold"
android:textSize="28sp"/>
- <EditText
+ <android.support.v7.widget.AppCompatEditText
android:layout_width="200dp"
android:layout_height="wrap_content"
android:textColor="@color/White"
android:backgroundTint="@color/colorPrimaryLight"
+ app:backgroundTint="@color/colorPrimaryLight"
android:hint="@string/sms_hint"
android:gravity="center"
android:inputType="phone"
@@ -39,7 +40,7 @@
android:layout_marginRight="40dp"
android:textStyle="bold"
- android:textSize="16dp"/>
+ android:textSize="16sp"/>
<Button
android:layout_width="120dp"
diff --git a/src/main/res/layout/event_item.xml b/src/main/res/layout/event_item.xml
index 82e28ec..95b5b69 100644
--- a/src/main/res/layout/event_item.xml
+++ b/src/main/res/layout/event_item.xml
@@ -46,12 +46,14 @@
android:gravity="center_vertical"
android:orientation="vertical"
android:visibility="gone"
- android:paddingLeft="4dp" />
+ android:paddingLeft="4dp"
+ android:paddingRight="4dp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/activity_margin_half"
+ android:paddingRight="4dp"
android:paddingLeft="4dp">
<TextView