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

Added material design preference settings.

Anupam Das98aff800acce
diff --git a/build.gradle b/build.gradle
index bda59aa..269d659 100644
--- a/build.gradle
+++ b/build.gradle
@@ -120,6 +120,7 @@ dependencies {
compile 'com.github.derlio.waveform:library:1.0.3@aar'
compile 'org.firezenk:audiowaves:1.1@aar'
compile 'com.maxproj.simplewaveform:app:1.0.0'
+ compile 'com.android.support:preference-v14:27.0.2'
implementation('com.mikepenz:aboutlibraries:6.0.1@aar') {
transitive = true
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index ab3e059..5eb28e5 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -35,7 +35,8 @@
</activity>
<activity
android:name="org.havenapp.main.SettingsActivity"
- android:label="@string/title_activity_start"
+ android:label="@string/settings"
+ android:theme="@style/SettingsTheme"
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="stateHidden" />
<activity android:name="org.havenapp.main.ui.PPAppIntro"
diff --git a/src/main/java/org/havenapp/main/PreferenceManager.java b/src/main/java/org/havenapp/main/PreferenceManager.java
index 1b2a2af..724b2e5 100644
--- a/src/main/java/org/havenapp/main/PreferenceManager.java
+++ b/src/main/java/org/havenapp/main/PreferenceManager.java
@@ -38,18 +38,25 @@ public class PreferenceManager {
public static final String FRONT = "Front";
public static final String BACK = "Back";
+ public static final String NONE = "None";
private static final String APP_SHARED_PREFS="org.havenapp.main";
private static final String ACCELEROMETER_ACTIVE="accelerometer_active";
private static final String ACCELEROMETER_SENSITIVITY="accelerometer_sensibility";
private static final String CAMERA_ACTIVE="camera_active";
- private static final String CAMERA="camera";
+ public static final String CAMERA="camera";
private static final String CAMERA_SENSITIVITY="camera_sensitivity";
+ public static final String CONFIG_MOVEMENT ="config_movement";
private static final String FLASH_ACTIVE="flash_active";
private static final String MICROPHONE_ACTIVE="microphone_active";
private static final String MICROPHONE_SENSITIVITY="microphone_sensitivity";
- private static final String SMS_ACTIVE="sms_active";
- private static final String SMS_NUMBER="sms_number";
+ public static final String CONFIG_SOUND = "config_sound";
+ public static final String CONFIG_TIME_DELAY = "config_delay_time";
+ public static final String SMS_ACTIVE = "sms_active";
+ public static final String SMS_NUMBER = "sms_number";
+ public static final String REGISTER_SIGNAL = "register_signal";
+ public static final String VERIFY_SIGNAL = "verify_signal";
+ public static final String SEND_SMS = "send_sms";
private static final String UNLOCK_CODE="unlock_code";
private static final String ACCESS_TOKEN="access_token";
@@ -59,9 +66,9 @@ public class PreferenceManager {
private static final String TIMER_DELAY="timer_delay";
private static final String DIR_PATH = "/secureit";
- private static final String REMOTE_ACCESS_ACTIVE = "remote_access_active";
- private static final String REMOTE_ACCESS_ONION = "remote_access_onion";
- private static final String REMOTE_ACCESS_CRED = "remote_access_credential";
+ public static final String REMOTE_ACCESS_ACTIVE = "remote_access_active";
+ public static final String REMOTE_ACCESS_ONION = "remote_access_onion";
+ public static final String REMOTE_ACCESS_CRED = "remote_access_credential";
private static final String SIGNAL_USERNAME = "signal_username";
diff --git a/src/main/java/org/havenapp/main/SettingsActivity.java b/src/main/java/org/havenapp/main/SettingsActivity.java
index a5d5b84..e1d5ca1 100644
--- a/src/main/java/org/havenapp/main/SettingsActivity.java
+++ b/src/main/java/org/havenapp/main/SettingsActivity.java
@@ -18,568 +18,21 @@
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.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;
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.EditText;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-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;
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);
setContentView(R.layout.activity_settings);
- Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
- setSupportActionBar(toolbar);
-
- preferences = new PreferenceManager(this.getApplicationContext());
-
- app = (HavenApp)getApplication();
-
- /*
- * We create an application directory to store images and audio
- */
- File directory = new File(Environment.getExternalStorageDirectory() + preferences.getDirPath());
- directory.mkdirs();
-
- /**
- * 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 EditText phoneNumber = (EditText)
- this.findViewById(R.id.phone_number);
-
- final EditText remoteAccessOnion = (EditText)
- this.findViewById(R.id.remote_access_onion);
-
- remoteAccessCredential = (EditText)
- this.findViewById(R.id.remote_access_credential);
-
-
- smsCheck.setOnCheckedChangeListener(new OnCheckedChangeListener() {
-
- public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- if (isChecked && TextUtils.isEmpty(preferences.getSignalUsername())) {
- askForPermission(Manifest.permission.SEND_SMS, 6);
- askForPermission(Manifest.permission.READ_PHONE_STATE,6);
- }
- }
- });
-
- remoteAccessCheck.setOnCheckedChangeListener(new OnCheckedChangeListener() {
- @Override
- public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
- if (isChecked) {
- checkRemoteAccessOnion();
- app.startServer();
- }
- else
- {
- app.stopServer();
- }
- }
- });
-
- 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);
-
- }
-
- if (preferences.getSmsActivation()) {
- smsCheck.setChecked(true);
- phoneNumber.setText(preferences.getSmsNumber());
- }
-
- if (preferences.getRemoteAccessActive()) {
- remoteAccessCheck.setChecked(true);
- remoteAccessOnion.setText(preferences.getRemoteAccessOnion() + ":" + WebServer.LOCAL_PORT);
- }
-
- if (!TextUtils.isEmpty(preferences.getRemoteAccessCredential()))
- {
- ((EditText)findViewById(R.id.remote_access_credential)).setText(preferences.getRemoteAccessCredential());
- }
-
- findViewById(R.id.action_register_signal).setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- registerSignalPrompt();
- }
- });
-
- findViewById(R.id.action_verify_signal).setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- verifySignalPrompt();
- }
- });
-
- checkSignalUsername();
-
- findViewById(R.id.action_configure_mic).setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- startActivity(new Intent(SettingsActivity.this, MicrophoneConfigureActivity.class));
- }
- });
-
- findViewById(R.id.action_configure_accel).setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- startActivity(new Intent(SettingsActivity.this, AccelConfigureActivity.class));
- }
- });
-
-
-
- findViewById(R.id.action_configure_time).setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- showTimeDelayDialog();
- }
- });
-
- askForPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, 1);
-
- }
-
- private void checkSignalUsername ()
- {
- if (preferences.getSignalUsername() != null)
- {
- TextView tv = (TextView)findViewById(R.id.label_signal_status);
- tv.setText("Current Signal Number: " + preferences.getSignalUsername());
-
- Button btnTestSignal = (Button)findViewById(R.id.action_test_signal);
- btnTestSignal.setVisibility(View.VISIBLE);
- btnTestSignal.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- sendTestSignal();
- }
- });
- }
- }
-
- @Override
- public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
- super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-
- switch (requestCode) {
- case 1:
- askForPermission(Manifest.permission.CAMERA,2);
- break;
- case 2:
- askForPermission(Manifest.permission.RECORD_AUDIO,3);
- break;
-
- }
-
- }
-
-
- private void askForPermission(String permission, Integer requestCode) {
- if (ContextCompat.checkSelfPermission(SettingsActivity.this, permission) != PackageManager.PERMISSION_GRANTED) {
-
- // Should we show an explanation?
- if (ActivityCompat.shouldShowRequestPermissionRationale(SettingsActivity.this, permission)) {
-
- //This is called if user has denied the permission before
- //In this case I am just asking the permission again
- ActivityCompat.requestPermissions(SettingsActivity.this, new String[]{permission}, requestCode);
-
- } else {
-
- ActivityCompat.requestPermissions(SettingsActivity.this, new String[]{permission}, requestCode);
- }
- } else {
- }
- }
-
- private void save ()
- {
-
- EditText phoneNumber = (EditText)
- 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);
-
- preferences.activateAccelerometer(true);
-
- preferences.activateCamera(true);
-
-
- preferences.activateMicrophone(true);
-
- if (smsCheck.isChecked() && !phoneNumber.getText().toString().equals("")) {
- Log.i("StartActivity", "Send message alert is active");
- preferences.activateSms(true);
- preferences.setSmsNumber(
- phoneNumber.getText().toString());
- } else {
- preferences.activateSms(false);
- }
-
- preferences.activateRemoteAccess(remoteAccessCheck.isChecked());
-
- String password = remoteAccessCredential.getText().toString();
- if (TextUtils.isEmpty(preferences.getRemoteAccessCredential())
- || (!password.equals(preferences.getRemoteAccessCredential()))) {
- preferences.setRemoteAccessCredential(password);
- app.stopServer();
- app.startServer();
- }
-
- setResult(RESULT_OK);
-
- finish();
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.monitor_start, menu);
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected (MenuItem item) {
- switch (item.getItemId()){
- case R.id.menu_save:
- save();
- break;
+ if (savedInstanceState == null) {
+ SettingsFragment fragment = new SettingsFragment();
+ getSupportFragmentManager().beginTransaction()
+ .add(R.id.settings_fragment, fragment)
+ .commit();
}
- return true;
- }
-
- private void checkRemoteAccessOnion ()
- {
- if (OrbotHelper.isOrbotInstalled(this))
- {
- OrbotHelper.requestStartTor(this);
-
- if (TextUtils.isEmpty(preferences.getRemoteAccessOnion()))
- OrbotHelper.requestHiddenServiceOnPort(this, WebServer.LOCAL_PORT);
- }
- else
- {
- Toast.makeText(this,"This feature requires the Orbot: Tor for Android app to be installed.",Toast.LENGTH_LONG);
- }
- }
-
- @Override
- protected void onActivityResult(int requestCode, int resultCode, Intent data) {
- super.onActivityResult(requestCode, resultCode, data);
-
- if (resultCode == RESULT_OK && data != null)
- {
- String onionHost = data.getStringExtra("hs_host");
-
- if (!TextUtils.isEmpty(onionHost)) {
- preferences.setRemoteAccessOnion(onionHost);
- final EditText remoteAccessOnion = (EditText)
- this.findViewById(R.id.remote_access_onion);
- remoteAccessOnion.setText(onionHost + ":" + WebServer.LOCAL_PORT);
- }
-
- }
- }
-
- public void onRadioButtonClicked(View view) {
- // Is the button now checked?
- boolean checked = ((RadioButton) view).isChecked();
-
- // Check which radio button was clicked
- switch(view.getId()) {
- case R.id.radio_camera_back:
- if (checked)
- preferences.setCamera(PreferenceManager.BACK);
- break;
- case R.id.radio_camera_front:
- if (checked)
- preferences.setCamera(PreferenceManager.FRONT);
- break;
- case R.id.radio_camera_none:
- if (checked)
- preferences.setCamera(PreferenceManager.OFF);
- break;
-
- }
- }
-
- private void verifySignalPrompt ()
- {
- // setup the alert builder
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
-
- //number of code
- final EditText input = new EditText(this);
- input.setInputType(InputType.TYPE_CLASS_NUMBER);
-
- // add a button
- builder.setPositiveButton(R.string.verify, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- activateSignal(preferences.getSignalUsername(),input.getText().toString());
- }
- });
- // add a button
- builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- dialog.cancel();
- }
- });
-
- // create and show the alert dialog
- AlertDialog dialog = builder.create();
-
- dialog.setTitle(getString(R.string.verify_signal));
- dialog.setMessage(getString(R.string.enter_verification));
- LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.MATCH_PARENT,
- LinearLayout.LayoutParams.MATCH_PARENT);
- lp.setMargins(6,6,6,6);
- input.setLayoutParams(lp);
- dialog.setView(input); // uncomment this line
-
- dialog.show();
-
- }
-
- private void registerSignalPrompt ()
- {
- // setup the alert builder
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
-
- //number of code
- final EditText input = new EditText(this);
- input.setInputType(InputType.TYPE_CLASS_PHONE);
- input.setLines(1);
- input.setHint(R.string.phone_hint);
-
- // add a button
- builder.setPositiveButton(R.string.register, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- String signalNum = input.getText().toString();
- signalNum = "+" + signalNum.replaceAll("[^0-9]", "");
-
- preferences.setSignalUsername(signalNum);
- resetSignal(preferences.getSignalUsername());
- activateSignal(preferences.getSignalUsername(),null);
- checkSignalUsername();
- }
- });
-
- // add a button
- builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- dialog.cancel();
- }
- });
-
-
- // create and show the alert dialog
- AlertDialog dialog = builder.create();
-
- dialog.setTitle(getString(R.string.register_title));
- dialog.setMessage(getString(R.string.register_signal_desc));
- LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.MATCH_PARENT,
- LinearLayout.LayoutParams.MATCH_PARENT);
- lp.setMargins(6,6,6,6);
- input.setLayoutParams(lp);
- dialog.setView(input); // uncomment this line
-
- dialog.show();
-
- }
-
- private void resetSignal (String username)
- {
- SignalSender sender =SignalSender.getInstance(this, username);
- sender.reset();
- }
-
- private void activateSignal (String username, String verifyCode)
- {
- SignalSender sender =SignalSender.getInstance(this, username);
-
- if (TextUtils.isEmpty(verifyCode))
- sender.register();
- else
- sender.verify(verifyCode);
-
- }
-
- private void sendTestSignal ()
- {
-
- // setup the alert builder
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
-
- //number of code
- final EditText input = new EditText(this);
- input.setInputType(InputType.TYPE_CLASS_PHONE);
-
- if (!TextUtils.isEmpty(preferences.getSmsNumber()))
- {
- input.setText(preferences.getSmsNumber());
- }
-
- // add a button
- builder.setPositiveButton("Send Test", new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- SignalSender sender =SignalSender.getInstance(SettingsActivity.this, preferences.getSignalUsername());
- ArrayList<String> recip = new ArrayList<>();
- recip.add(input.getText().toString());
- sender.sendMessage(recip,getString(R.string.signal_test_message),null);
- }
- });
-
- // add a button
- builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- dialog.cancel();
- }
- });
-
-
- // create and show the alert dialog
- AlertDialog dialog = builder.create();
-
- dialog.setTitle("Send Test Signal");
- dialog.setMessage("Enter a phone number (+12125551212) to send a test message to");
- LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.MATCH_PARENT,
- LinearLayout.LayoutParams.MATCH_PARENT);
- lp.setMargins(6,6,6,6);
- input.setLayoutParams(lp);
- dialog.setView(input); // uncomment this line
-
- dialog.show();
- }
-
- private void showTimeDelayDialog ()
- {
- int totalSecs = preferences.getTimerDelay();
-
- int hours = totalSecs / 3600;
- int minutes = (totalSecs % 3600) / 60;
- int seconds = totalSecs % 60;
-
-
- final NumberPicker pickerMinutes = new NumberPicker(this);
- pickerMinutes.setMinValue(0);
- pickerMinutes.setMaxValue(59);
- pickerMinutes.setValue(minutes);
-
- final NumberPicker pickerSeconds = new NumberPicker(this);
- pickerSeconds.setMinValue(0);
- pickerSeconds.setMaxValue(59);
- pickerSeconds.setValue(seconds);
-
- final TextView textViewMinutes = new TextView(this);
- textViewMinutes.setText("m");
- textViewMinutes.setTextSize(30);
- textViewMinutes.setGravity(Gravity.CENTER_VERTICAL);
-
- final TextView textViewSeconds = new TextView(this);
- textViewSeconds.setText("s");
- textViewSeconds.setTextSize(30);
- textViewSeconds.setGravity(Gravity.CENTER_VERTICAL);
-
-
- final LinearLayout layout = new LinearLayout(this);
- layout.setOrientation(LinearLayout.HORIZONTAL);
- layout.addView(pickerMinutes, new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.WRAP_CONTENT,
- LinearLayout.LayoutParams.WRAP_CONTENT,
- Gravity.LEFT));
-
- layout.addView(textViewMinutes, new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.WRAP_CONTENT,
- LinearLayout.LayoutParams.MATCH_PARENT,
- Gravity.LEFT|Gravity.BOTTOM));
-
- layout.addView(pickerSeconds, new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.WRAP_CONTENT,
- LinearLayout.LayoutParams.MATCH_PARENT,
- Gravity.LEFT));
-
- layout.addView(textViewSeconds, new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.WRAP_CONTENT,
- LinearLayout.LayoutParams.MATCH_PARENT,
- Gravity.LEFT|Gravity.BOTTOM));
-
-
- new android.app.AlertDialog.Builder(this)
- .setView(layout)
- .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialogInterface, int i) {
- // do something with picker.getValue()
- int delaySeconds = pickerSeconds.getValue() + (pickerMinutes.getValue() * 60);
- preferences.setTimerDelay(delaySeconds);
- }
- })
- .setNegativeButton(android.R.string.cancel, null)
- .show();
}
}
-
diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.java
new file mode 100644
index 0000000..e3c0955
--- /dev/null
+++ b/src/main/java/org/havenapp/main/SettingsFragment.java
@@ -0,0 +1,473 @@
+package org.havenapp.main;
+
+/**
+ * Created by Anupam Das (opticod) on 29/12/17.
+ */
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.NonNull;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.preference.EditTextPreference;
+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.text.TextUtils;
+import android.view.Gravity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.widget.LinearLayout;
+import android.widget.NumberPicker;
+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 SettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
+
+ private PreferenceManager preferences;
+ private HavenApp app;
+ private Activity mActivity;
+
+ @Override
+ public void onCreatePreferences(Bundle bundle, String s) {
+ addPreferencesFromResource(R.xml.settings);
+ mActivity = getActivity();
+ preferences = new PreferenceManager(mActivity);
+ setHasOptionsMenu(true);
+ app = (HavenApp) mActivity.getApplication();
+
+ /*
+ * We create an application directory to store images and audio
+ */
+ File directory = new File(Environment.getExternalStorageDirectory() + preferences.getDirPath());
+ directory.mkdirs();
+
+ if (preferences.getCameraActivation()) {
+
+ String camera = preferences.getCamera();
+ switch (camera) {
+ case PreferenceManager.FRONT:
+ ((ListPreference) findPreference(PreferenceManager.CAMERA)).setValueIndex(0);
+ findPreference(PreferenceManager.CAMERA).setSummary(PreferenceManager.FRONT);
+ break;
+ case PreferenceManager.BACK:
+ ((ListPreference) findPreference(PreferenceManager.CAMERA)).setValueIndex(1);
+ findPreference(PreferenceManager.CAMERA).setSummary(PreferenceManager.BACK);
+ break;
+ case PreferenceManager.OFF:
+ ((ListPreference) findPreference(PreferenceManager.CAMERA)).setValueIndex(2);
+ findPreference(PreferenceManager.CAMERA).setSummary(PreferenceManager.NONE);
+ break;
+ }
+
+ }
+
+ if (preferences.getSmsActivation()) {
+ ((SwitchPreferenceCompat) findPreference(PreferenceManager.SMS_ACTIVE)).setChecked(true);
+ }
+
+ if (checkValidString(preferences.getSmsNumber())) {
+ ((EditTextPreference) findPreference(PreferenceManager.SMS_NUMBER)).setText(preferences.getSmsNumber().trim());
+ findPreference(PreferenceManager.SMS_NUMBER).setSummary(preferences.getSmsNumber().trim());
+ } else {
+ findPreference(PreferenceManager.SMS_NUMBER).setSummary(R.string.sms_dialog_message);
+ }
+
+ if (preferences.getRemoteAccessActive()) {
+ ((SwitchPreferenceCompat) findPreference(PreferenceManager.REMOTE_ACCESS_ACTIVE)).setChecked(true);
+ }
+
+ if (checkValidString(preferences.getRemoteAccessOnion())) {
+ ((EditTextPreference) findPreference(PreferenceManager.REMOTE_ACCESS_ONION)).setText(preferences.getRemoteAccessOnion().trim() + ":" + WebServer.LOCAL_PORT);
+ findPreference(PreferenceManager.REMOTE_ACCESS_ONION).setSummary(preferences.getRemoteAccessOnion().trim() + ":" + WebServer.LOCAL_PORT);
+ } else {
+ findPreference(PreferenceManager.REMOTE_ACCESS_ONION).setSummary(R.string.remote_access_hint);
+ }
+
+ if (checkValidString(preferences.getRemoteAccessCredential())) {
+ ((EditTextPreference) findPreference(PreferenceManager.REMOTE_ACCESS_CRED)).setText(preferences.getRemoteAccessCredential().trim());
+ findPreference(PreferenceManager.REMOTE_ACCESS_CRED).setSummary(preferences.getRemoteAccessCredential().trim());
+ } else {
+ findPreference(PreferenceManager.REMOTE_ACCESS_CRED).setSummary(R.string.remote_access_credential_hint);
+ }
+
+ if (checkValidString(preferences.getSignalUsername())) {
+ findPreference(PreferenceManager.SEND_SMS).setSelectable(true);
+ String signalNum = "+" + preferences.getSignalUsername().trim().replaceAll("[^0-9]", "");
+ findPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(signalNum);
+ } else {
+ findPreference(PreferenceManager.SEND_SMS).setSelectable(false);
+ findPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(R.string.register_signal_desc);
+ }
+
+ Preference prefConfigMovement = findPreference(PreferenceManager.CONFIG_MOVEMENT);
+ prefConfigMovement.setOnPreferenceClickListener(preference -> {
+ startActivity(new Intent(mActivity, AccelConfigureActivity.class));
+ return true;
+ });
+
+ Preference prefConfigSound = findPreference(PreferenceManager.CONFIG_SOUND);
+ prefConfigSound.setOnPreferenceClickListener(preference -> {
+ startActivity(new Intent(mActivity, MicrophoneConfigureActivity.class));
+ return true;
+ });
+
+ Preference prefConfigTimeDelay = findPreference(PreferenceManager.CONFIG_TIME_DELAY);
+ prefConfigTimeDelay.setOnPreferenceClickListener(preference -> {
+ showTimeDelayDialog();
+ return true;
+ });
+
+ checkSignalUsername();
+ ((EditTextPreference) findPreference(PreferenceManager.VERIFY_SIGNAL)).setText("");
+ askForPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, 1);
+
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case R.id.menu_save:
+ save();
+ return true;
+ default:
+ break;
+ }
+
+ return false;
+ }
+
+ private void save() {
+ preferences.activateAccelerometer(true);
+
+ preferences.activateCamera(true);
+
+ preferences.activateMicrophone(true);
+
+ setPhoneNumber();
+
+ boolean remoteAccessActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.REMOTE_ACCESS_ACTIVE)).isChecked();
+
+ preferences.activateRemoteAccess(remoteAccessActive);
+ String password = ((EditTextPreference) findPreference(PreferenceManager.REMOTE_ACCESS_CRED)).getText();
+
+ if (checkValidStrings(password, preferences.getRemoteAccessCredential()) && (TextUtils.isEmpty(preferences.getRemoteAccessCredential()) || !password.trim().equals(preferences.getRemoteAccessCredential().trim()))) {
+ preferences.setRemoteAccessCredential(password.trim());
+ app.stopServer();
+ app.startServer();
+ }
+
+ mActivity.setResult(Activity.RESULT_OK);
+ mActivity.finish();
+ }
+
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+
+ if (resultCode == Activity.RESULT_OK && data != null) {
+ String onionHost = data.getStringExtra("hs_host");
+
+ if (checkValidString(onionHost)) {
+ preferences.setRemoteAccessOnion(onionHost.trim());
+ ((EditTextPreference) findPreference(PreferenceManager.REMOTE_ACCESS_ONION)).setText(preferences.getRemoteAccessOnion().trim() + ":" + WebServer.LOCAL_PORT);
+ if (checkValidString(preferences.getRemoteAccessOnion())) {
+ findPreference(PreferenceManager.REMOTE_ACCESS_ONION).setSummary(preferences.getRemoteAccessOnion().trim() + ":" + WebServer.LOCAL_PORT);
+ } else {
+ findPreference(PreferenceManager.REMOTE_ACCESS_ONION).setSummary(R.string.remote_access_hint);
+ }
+ }
+ }
+ }
+
+ @Override
+ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+ inflater.inflate(R.menu.monitor_start, menu);
+ super.onCreateOptionsMenu(menu, inflater);
+ }
+
+ @Override
+ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+ super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+ switch (requestCode) {
+ case 1:
+ askForPermission(Manifest.permission.CAMERA, 2);
+ break;
+ case 2:
+ askForPermission(Manifest.permission.RECORD_AUDIO, 3);
+ break;
+
+ }
+
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ getPreferenceScreen().getSharedPreferences()
+ .registerOnSharedPreferenceChangeListener(this);
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ getPreferenceScreen().getSharedPreferences()
+ .unregisterOnSharedPreferenceChangeListener(this);
+ }
+
+ @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;
+
+ }
+ } else if (PreferenceManager.SMS_ACTIVE.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);
+ }
+ 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();
+
+ if (checkValidString(signalNum)) {
+ findPreference(PreferenceManager.SEND_SMS).setSelectable(true);
+ signalNum = "+" + signalNum.trim().replaceAll("[^0-9]", "");
+
+ preferences.setSignalUsername(signalNum);
+ findPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(signalNum);
+
+ resetSignal(preferences.getSignalUsername());
+ activateSignal(preferences.getSignalUsername(), null);
+ } else {
+ preferences.setSignalUsername(signalNum);
+ findPreference(PreferenceManager.SEND_SMS).setSelectable(false);
+ findPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(R.string.register_signal_desc);
+ }
+ } else if (PreferenceManager.SEND_SMS.equals(key)) {
+ String text = ((EditTextPreference) findPreference(PreferenceManager.SEND_SMS)).getText();
+ sendTestSignal(text);
+ } else if (PreferenceManager.VERIFY_SIGNAL.equals(key)) {
+ String text = ((EditTextPreference) findPreference(PreferenceManager.VERIFY_SIGNAL)).getText();
+ activateSignal(preferences.getSignalUsername(), text);
+ ((EditTextPreference) findPreference(PreferenceManager.VERIFY_SIGNAL)).setText("");
+ } else if (PreferenceManager.SMS_NUMBER.equals(key)) {
+ 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);
+ }
+ } 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);
+ }
+ }
+ }
+
+ private void setPhoneNumber() {
+ boolean smsActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.SMS_ACTIVE)).isChecked();
+ String phoneNumber = ((EditTextPreference) findPreference(PreferenceManager.SMS_NUMBER)).getText();
+ if (smsActive && checkValidString(phoneNumber)) {
+ preferences.activateSms(true);
+ } else {
+ preferences.activateSms(false);
+ }
+
+ if (checkValidString(phoneNumber)) {
+ preferences.setSmsNumber(phoneNumber.trim());
+ findPreference(PreferenceManager.SMS_NUMBER).setSummary(phoneNumber.trim());
+ } else {
+ findPreference(PreferenceManager.SMS_NUMBER).setSummary(R.string.sms_dialog_message);
+ }
+ }
+
+ private void showTimeDelayDialog() {
+ int totalSecs = preferences.getTimerDelay();
+
+ int hours = totalSecs / 3600;
+ int minutes = (totalSecs % 3600) / 60;
+ int seconds = totalSecs % 60;
+
+
+ final NumberPicker pickerMinutes = new NumberPicker(mActivity);
+ pickerMinutes.setMinValue(0);
+ pickerMinutes.setMaxValue(59);
+ pickerMinutes.setValue(minutes);
+
+ final NumberPicker pickerSeconds = new NumberPicker(mActivity);
+ pickerSeconds.setMinValue(0);
+ pickerSeconds.setMaxValue(59);
+ pickerSeconds.setValue(seconds);
+
+ final TextView textViewMinutes = new TextView(mActivity);
+ textViewMinutes.setText("m");
+ textViewMinutes.setTextSize(30);
+ textViewMinutes.setGravity(Gravity.CENTER_VERTICAL);
+
+ final TextView textViewSeconds = new TextView(mActivity);
+ textViewSeconds.setText("s");
+ textViewSeconds.setTextSize(30);
+ textViewSeconds.setGravity(Gravity.CENTER_VERTICAL);
+
+
+ final LinearLayout layout = new LinearLayout(mActivity);
+ layout.setOrientation(LinearLayout.HORIZONTAL);
+ layout.addView(pickerMinutes, new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ Gravity.LEFT));
+
+ layout.addView(textViewMinutes, new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ Gravity.LEFT | Gravity.BOTTOM));
+
+ layout.addView(pickerSeconds, new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ Gravity.LEFT));
+
+ layout.addView(textViewSeconds, new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ Gravity.LEFT | Gravity.BOTTOM));
+
+
+ new android.app.AlertDialog.Builder(mActivity)
+ .setView(layout)
+ .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ // do something with picker.getValue()
+ int delaySeconds = pickerSeconds.getValue() + (pickerMinutes.getValue() * 60);
+ preferences.setTimerDelay(delaySeconds);
+ }
+ })
+ .setNegativeButton(android.R.string.cancel, null)
+ .show();
+ }
+
+ private boolean checkValidString(String a) {
+ return a != null && !a.trim().isEmpty();
+ }
+
+ private boolean checkValidStrings(String a, String b) {
+ return a != null && !a.trim().isEmpty() && b != null && !b.trim().isEmpty();
+ }
+
+ private void sendTestSignal(String text) {
+ if (checkValidStrings(text, preferences.getSignalUsername())) {
+ SignalSender sender = SignalSender.getInstance(mActivity, preferences.getSignalUsername().trim());
+ ArrayList<String> recip = new ArrayList<>();
+ recip.add(text);
+ sender.sendMessage(recip, getString(R.string.signal_test_message), null);
+ }
+ }
+
+ private void checkSignalUsername() {
+ if (checkValidString(preferences.getSignalUsername())) {
+ findPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(preferences.getSignalUsername().trim());
+ ((EditTextPreference) findPreference(PreferenceManager.REGISTER_SIGNAL)).setText(preferences.getSignalUsername().trim());
+ findPreference(PreferenceManager.SEND_SMS).setSelectable(true);
+ } else {
+ findPreference(PreferenceManager.SEND_SMS).setSelectable(false);
+ findPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(R.string.register_signal_desc);
+ }
+ }
+
+ private void activateSignal(String username, String verifyCode) {
+ SignalSender sender = SignalSender.getInstance(mActivity, username);
+
+ if (TextUtils.isEmpty(verifyCode)) {
+ sender.register();
+ } else {
+ sender.verify(verifyCode);
+ }
+ }
+
+ private void resetSignal(String username) {
+ if (checkValidString((username))) {
+ SignalSender sender = SignalSender.getInstance(mActivity, username.trim());
+ sender.reset();
+ }
+ }
+
+ private void checkRemoteAccessOnion() {
+ if (OrbotHelper.isOrbotInstalled(mActivity)) {
+ OrbotHelper.requestStartTor(mActivity);
+
+ if (preferences.getRemoteAccessOnion() != null && TextUtils.isEmpty(preferences.getRemoteAccessOnion().trim())) {
+ OrbotHelper.requestHiddenServiceOnPort(mActivity, WebServer.LOCAL_PORT);
+ }
+ } else {
+ Toast.makeText(mActivity, R.string.remote_access_onion_error, Toast.LENGTH_LONG).show();
+ }
+ }
+
+ private void askForPermission(String permission, Integer requestCode) {
+ if (mActivity != null && ContextCompat.checkSelfPermission(mActivity, permission) != PackageManager.PERMISSION_GRANTED) {
+
+ // Should we show an explanation?
+ if (ActivityCompat.shouldShowRequestPermissionRationale(mActivity, permission)) {
+
+ //This is called if user has denied the permission before
+ //In this case I am just asking the permission again
+ ActivityCompat.requestPermissions(mActivity, new String[]{permission}, requestCode);
+
+ } else {
+
+ ActivityCompat.requestPermissions(mActivity, new String[]{permission}, requestCode);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/res/layout/activity_settings.xml b/src/main/res/layout/activity_settings.xml
index 7ccb38b..14022d8 100644
--- a/src/main/res/layout/activity_settings.xml
+++ b/src/main/res/layout/activity_settings.xml
@@ -1,230 +1,7 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- xmlns:app="http://schemas.android.com/apk/res-auto">
-
- <android.support.v7.widget.Toolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
- android:background="?attr/colorPrimary"
- android:theme="@style/AppTheme.AppBarOverlay"/>
- app:popupTheme="@style/AppTheme.PopupOverlay" />
-<ScrollView
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-<LinearLayout
- android:orientation="vertical"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/settings_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:padding="6sp"
- >
-
- <TextView
- android:id="@+id/camera_prompt"
- android:text="@string/camera_prompt"
- android:layout_alignParentLeft="true"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="10dp"
- />
- <!--
- <Spinner
- android:id="@+id/camera_spinner"
- android:layout_alignParentRight="true"
- android:prompt="@string/camera_prompt"
- android:entries="@array/select_camera"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
- />-->
- <RadioGroup
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
- <RadioButton android:id="@+id/radio_camera_front"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/camera_front"
- android:onClick="onRadioButtonClicked"
- android:layout_margin="6dp"
- />
- <RadioButton android:id="@+id/radio_camera_back"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/camera_back"
- android:onClick="onRadioButtonClicked"
- android:layout_margin="6dp"
- />
- <RadioButton android:id="@+id/radio_camera_none"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/camera_none"
- android:onClick="onRadioButtonClicked"
- android:layout_margin="6dp"/>
- </RadioGroup>
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:paddingTop="10dp"
-
- >
-
-
- <TextView
- android:id="@+id/microphone_prompt"
- android:text="@string/microphone_sensitivity"
- android:layout_alignParentLeft="true"
- android:layout_width="200dp"
- android:layout_height="wrap_content"
- />
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/action_configure"
-
- android:id="@+id/action_configure_mic"
- />
-</LinearLayout>
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:paddingTop="10dp"
-
- >
-
-
- <TextView
- android:id="@+id/accelerometer_prompt"
- android:text="@string/accelerometer_prompt"
- android:layout_alignParentLeft="true"
- android:layout_width="200dp"
- android:layout_height="wrap_content"
- />
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/action_configure"
-
- android:id="@+id/action_configure_accel"
- />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- >
- <TextView
- android:id="@+id/timer_label"
- android:text="@string/timer_delay_label"
- android:layout_width="200dp"
- android:layout_height="wrap_content"
- />
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/action_configure"
- android:id="@+id/action_configure_time"
- />
- </LinearLayout>
- <CheckBox
- android:id="@+id/sms_check"
- android:text="@string/sms_label"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
- tools:context="org.havenapp.main.SettingsActivity" />
-
- <EditText
- android:id="@+id/phone_number"
- android:hint="@string/sms_hint"
- android:inputType="phone"
- android:layout_centerHorizontal="true"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:paddingTop="10dp"
- />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:paddingTop="10dp"
-
- >
-
- <TextView
- android:id="@+id/label_signal"
- android:text="@string/activate_signal"
- android:layout_alignParentLeft="true"
- android:layout_width="150dp"
- android:layout_height="wrap_content"
- />
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/register"
- android:id="@+id/action_register_signal"
- />
-
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/verify"
- android:id="@+id/action_verify_signal"
- />
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:paddingTop="10dp"
-
- >
-
- <TextView
- android:id="@+id/label_signal_status"
- android:text=""
- android:layout_alignParentLeft="true"
- android:layout_width="150dp"
- android:layout_height="wrap_content"
- />
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/send_test_message"
- android:id="@+id/action_test_signal"
- android:visibility="gone"
- />
- </LinearLayout>
- <CheckBox
- android:id="@+id/remote_access_check"
- android:text="@string/remote_access_label"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- tools:context="org.havenapp.main.SettingsActivity" />
- <EditText
- android:id="@+id/remote_access_onion"
- android:hint="@string/remote_access_hint"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- tools:context="org.havenapp.main.SettingsActivity" />
- <EditText
- android:id="@+id/remote_access_credential"
- android:hint="@string/remote_access_credential_hint"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:inputType="textPassword"
- tools:context="org.havenapp.main.SettingsActivity" />
-
-</LinearLayout>
-
- </ScrollView>
-</LinearLayout>
\ No newline at end of file
+ tools:context="org.havenapp.main.SettingsActivity"
+ tools:ignore="MergeRootFrame" />
diff --git a/src/main/res/layout/pref_dialog_edit_text.xml b/src/main/res/layout/pref_dialog_edit_text.xml
new file mode 100644
index 0000000..1d7db80
--- /dev/null
+++ b/src/main/res/layout/pref_dialog_edit_text.xml
@@ -0,0 +1,34 @@
+<ScrollView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginBottom="@dimen/activity_vertical_large_margin"
+ android:layout_marginTop="@dimen/activity_vertical_large_margin"
+ android:overScrollMode="ifContentScrolls">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/alert_def_padding"
+ android:paddingBottom="@dimen/alert_def_padding"
+ android:paddingStart="?dialogPreferredPadding"
+ android:paddingLeft="?dialogPreferredPadding"
+ android:paddingEnd="?dialogPreferredPadding"
+ android:paddingRight="?dialogPreferredPadding"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@android:id/message"
+ style="?android:attr/textAppearanceSmall"
+ android:layout_marginBottom="@dimen/alert_def_padding"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textColor="?android:attr/textColorSecondary" />
+
+ <EditText
+ android:id="@android:id/edit"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/src/main/res/layout/pref_dialog_edit_text_hint.xml b/src/main/res/layout/pref_dialog_edit_text_hint.xml
new file mode 100644
index 0000000..248b677
--- /dev/null
+++ b/src/main/res/layout/pref_dialog_edit_text_hint.xml
@@ -0,0 +1,34 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginBottom="@dimen/activity_vertical_large_margin"
+ android:layout_marginTop="@dimen/activity_vertical_large_margin"
+ android:overScrollMode="ifContentScrolls">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingBottom="@dimen/alert_def_padding"
+ android:paddingEnd="?dialogPreferredPadding"
+ android:paddingLeft="?dialogPreferredPadding"
+ android:paddingRight="?dialogPreferredPadding"
+ android:paddingStart="?dialogPreferredPadding"
+ android:paddingTop="@dimen/alert_def_padding">
+
+ <TextView
+ android:id="@android:id/message"
+ style="?android:attr/textAppearanceSmall"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/alert_def_padding"
+ android:textColor="?android:attr/textColorSecondary" />
+
+ <EditText
+ android:id="@android:id/edit"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/hint_number" />
+
+ </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/src/main/res/values/array.xml b/src/main/res/values/array.xml
new file mode 100644
index 0000000..af06589
--- /dev/null
+++ b/src/main/res/values/array.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string-array name="camera">
+ <item>@string/camera_front</item>
+ <item>@string/camera_back</item>
+ <item>@string/camera_none</item>
+ </string-array>
+ <string-array name="camera_alias">
+ <item>0</item>
+ <item>1</item>
+ <item>2</item>
+ </string-array>
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index fe71647..405bcec 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Palette generated by Material Palette - materialpalette.com/blue/amber -->
+<?xml version="1.0" encoding="utf-8"?><!-- Palette generated by Material Palette - materialpalette.com/blue/amber -->
<resources>
-<color name="colorPrimary">#2196F3</color>
-<color name="colorPrimaryDark">#1976D2</color>
-<color name="colorPrimaryLight">#BBDEFB</color>
-<color name="colorAccent">#f5c229</color>
+ <color name="colorPrimary">#2196F3</color>
+ <color name="colorPrimaryDark">#1976D2</color>
+ <color name="colorPrimaryLight">#BBDEFB</color>
+ <color name="colorAccent">#f5c229</color>
+ <color name="primary_text">#212121</color>
+ <color name="secondary_text">#757575</color>
</resources>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 5df090c..2577f88 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -9,5 +9,7 @@
<dimen name="activity_margin_half">8dp</dimen>
<dimen name="app_bar_height">180dp</dimen>
+ <dimen name="alert_def_padding">18dp</dimen>
+ <dimen name="activity_vertical_large_margin">48dp</dimen>
</resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index d5e7407..ba91e20 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -51,6 +51,7 @@
<string name="onboarding_action_end">Finish</string>
+ <string name="remote_access">Remote Access</string>
<string name="remote_access_label">Enable remote access via Tor Onion Service</string>
<string name="remote_access_hint">Onion service address from Orbot</string>
<string name="remote_access_credential_hint">Set remote password</string>
@@ -108,4 +109,21 @@
<string name="sensor_power">USB Power</string>
<string name="sensor_bump">Bump (Accelerometer)</string>
<string name="sensor_unknown">Unknown</string>
+
+ <string name="settings">Settings</string>
+ <string name="remote_access_onion_error">This feature requires the Orbot: Tor for Android app to be installed.</string>
+
+ <!--Preference Settings -->
+ <string name="hint_number" translatable="false">+12125551212</string>
+ <string name="sms_dialog_message">Register a phone number (+12125551212) to receive a text when the app hears or sees something</string>
+ <string name="sms_dialog_summary">Register a phone number to receive a text when the app hears or sees something</string>
+ <string name="signal_dialog_summary">Register a new phone number with signal to send secure notifications</string>
+ <string name="verification_dialog_summary">Verify the code received from the signal registration step</string>
+ <string name="send_message_dialog">Enter a phone number (+12125551212) to send a text message to</string>
+ <string name="send_text_message">Send Text Message</string>
+ <string name="service_address">Service Address</string>
+ <string name="password">Password</string>
+ <string name="signal_number">Signal Number</string>
+ <string name="phone_number">Phone Number</string>
+
</resources>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 5cbeda1..4108fc1 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -7,13 +7,45 @@
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
+ <item name="android:textColorPrimary">@color/primary_text</item>
+ <item name="android:textColorSecondary">@color/secondary_text</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
+ <style name="SettingsTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+ <!-- Customize your theme here. -->
+ <item name="colorPrimary">@color/colorPrimary</item>
+ <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+ <item name="colorAccent">@color/colorAccent</item>
+ <item name="android:textColorPrimary">@color/primary_text</item>
+ <item name="android:textColorSecondary">@color/secondary_text</item>
+ <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+ </style>
+
+ <!-- Style for an Preference Entry -->
+ <style name="AppPreference">
+ <item name="android:layout">@layout/preference_material</item>
+ </style>
+
+ <!-- Style for a DialogPreference Entry -->
+ <style name="AppPreference.DialogPreferenceRegister">
+ <item name="positiveButtonText">@string/register</item>
+ <item name="negativeButtonText">@android:string/cancel</item>
+ </style>
+
+ <style name="AppPreference.DialogPreferenceVerify">
+ <item name="positiveButtonText">@string/verify</item>
+ <item name="negativeButtonText">@android:string/cancel</item>
+ </style>
+
+ <style name="AppPreference.DialogPreferenceSendText">
+ <item name="positiveButtonText">@string/send_text_message</item>
+ <item name="negativeButtonText">@android:string/cancel</item>
+ </style>
+
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
</resources>
\ No newline at end of file
diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml
new file mode 100644
index 0000000..41ba536
--- /dev/null
+++ b/src/main/res/xml/settings.xml
@@ -0,0 +1,87 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+ <ListPreference
+ android:entries="@array/camera"
+ android:entryValues="@array/camera_alias"
+ android:key="camera"
+ android:title="@string/camera_prompt" />
+
+ <PreferenceCategory android:title="@string/action_configure">
+
+ <Preference
+ android:key="config_sound"
+ android:title="@string/microphone_sensitivity" />
+
+ <Preference
+ android:key="config_movement"
+ android:title="@string/accelerometer_prompt" />
+
+ <Preference
+ android:key="config_delay_time"
+ android:title="@string/timer_delay_label" />
+
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/activate_signal">
+
+ <SwitchPreferenceCompat
+ android:defaultValue="true"
+ android:key="sms_active"
+ android:title="@string/sms_label" />
+
+ <EditTextPreference
+ style="@style/AppPreference.DialogPreferenceRegister"
+ android:dialogLayout="@layout/pref_dialog_edit_text_hint"
+ android:dialogMessage="@string/sms_dialog_message"
+ android:inputType="phone"
+ android:key="sms_number"
+ android:summary="@string/sms_dialog_summary"
+ android:title="@string/phone_number" />
+
+ <EditTextPreference
+ style="@style/AppPreference.DialogPreferenceRegister"
+ android:dialogLayout="@layout/pref_dialog_edit_text_hint"
+ android:dialogMessage="@string/register_signal_desc"
+ android:inputType="phone"
+ android:key="register_signal"
+ android:summary="@string/signal_dialog_summary"
+ android:title="@string/signal_number" />
+
+ <EditTextPreference
+ style="@style/AppPreference.DialogPreferenceVerify"
+ android:dialogLayout="@layout/pref_dialog_edit_text"
+ android:dialogMessage="@string/enter_verification"
+ android:inputType="number"
+ android:key="verify_signal"
+ android:summary="@string/verification_dialog_summary"
+ android:title="@string/verify_signal" />
+
+ <EditTextPreference
+ style="@style/AppPreference.DialogPreferenceSendText"
+ android:dialogLayout="@layout/pref_dialog_edit_text"
+ android:dialogMessage="@string/send_message_dialog"
+ android:inputType="phone"
+ android:key="send_sms"
+ android:title="@string/send_text_message" />
+
+ <SwitchPreferenceCompat
+ android:defaultValue="false"
+ android:key="remote_access_active"
+ android:summary="@string/remote_access_label"
+ android:title="@string/remote_access" />
+
+ <EditTextPreference
+ android:dialogLayout="@layout/pref_dialog_edit_text"
+ android:dialogMessage="@string/remote_access_hint"
+ android:key="remote_access_onion"
+ android:summary="@string/remote_access_hint"
+ android:title="@string/service_address" />
+
+ <EditTextPreference
+ android:dialogLayout="@layout/pref_dialog_edit_text"
+ android:dialogMessage="@string/remote_access_credential_hint"
+ android:inputType="textPassword"
+ android:key="remote_access_credential"
+ android:summary="@string/remote_access_credential_hint"
+ android:title="@string/password" />
+ </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file