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

Merge branch 'fixLintIssues' of https://github.com/fat-tire/haven into fat-tire-fixLintIssues

n8fr810bf55793043
diff --cc src/main/java/org/havenapp/main/MonitorActivity.java
index e1cc736,a922d8a..c8dc724
--- a/src/main/java/org/havenapp/main/MonitorActivity.java
+++ b/src/main/java/org/havenapp/main/MonitorActivity.java
@@@ -26,12 -28,13 +26,11 @@@ import android.support.v4.app.ActivityC
import android.support.v4.app.FragmentActivity;
import android.support.v4.content.ContextCompat;
import android.util.Log;
-import android.view.Gravity;
import android.view.View;
import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.NumberPicker;
import android.widget.TextView;
+import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
-
import org.havenapp.main.service.MonitorService;
import org.havenapp.main.ui.AccelConfigureActivity;
import org.havenapp.main.ui.CameraFragment;
diff --cc src/main/java/org/havenapp/main/SettingsActivity.java
index e1d5ca1,8620a40..d7ae4a7
--- a/src/main/java/org/havenapp/main/SettingsActivity.java
+++ b/src/main/java/org/havenapp/main/SettingsActivity.java
@@@ -18,10 -18,51 +18,15 @@@
package org.havenapp.main;
-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.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.text.InputType;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-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 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;
- private HavenApp app = null;
- private EditText remoteAccessCredential;
-
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);