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
add countdown timer and fix audio playback
n8fr829efbdec0cf9
diff --git a/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java b/src/main/java/info/guardianproject/phoneypot/MonitorActivity.javaindex ba5f264..c363c55 100644--- a/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java+++ b/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java@@ -64,7 +64,7 @@ public class MonitorActivity extends FragmentActivity {private void initTimer (){- cTimer = new CountDownTimer(10000, 1000) {+ cTimer = new CountDownTimer((preferences.getTimerDelay()+1)*1000, 1000) {public void onTick(long millisUntilFinished) {// mTextField.setText("seconds remaining: " + millisUntilFinished / 1000);@@ -75,7 +75,7 @@ public class MonitorActivity extends FragmentActivity {public void onFinish() {-+ txtTimer.setVisibility(View.GONE);initMonitor();}diff --git a/src/main/java/info/guardianproject/phoneypot/PreferenceManager.java b/src/main/java/info/guardianproject/phoneypot/PreferenceManager.javaindex fb636a7..c4b0e81 100644--- a/src/main/java/info/guardianproject/phoneypot/PreferenceManager.java+++ b/src/main/java/info/guardianproject/phoneypot/PreferenceManager.java@@ -44,7 +44,7 @@ public class PreferenceManager {private static final String DELEGATED_ACCESS_TOKEN="deferred_access_token";private static final String PHONE_ID="phone_id";-+ private static final String TIMER_DELAY="timer_delay";private static final String DIR_PATH = "/secureit";private Context context;@@ -193,7 +193,18 @@ public class PreferenceManager {public String getPhoneId() {return appSharedPrefs.getString(PHONE_ID, "");}-++ public int getTimerDelay ()+ {+ return appSharedPrefs.getInt(TIMER_DELAY,10);+ }++ public void setTimerDelay (int delay)+ {+ prefsEditor.putInt(TIMER_DELAY,delay);+ prefsEditor.commit();+ }+public String getDirPath() {return DIR_PATH;}diff --git a/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java b/src/main/java/info/guardianproject/phoneypot/SettingsActivity.javaindex f48f0b2..2abdabb 100644--- a/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java+++ b/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java@@ -85,6 +85,10 @@ public class SettingsActivity extends AppCompatActivity {final EditText phoneNumber = (EditText)this.findViewById(R.id.phone_number);++ final EditText timerDelay = (EditText)+ this.findViewById(R.id.timer_delay);+smsCheck.setOnCheckedChangeListener(new OnCheckedChangeListener() {public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {@@ -134,6 +138,8 @@ public class SettingsActivity extends AppCompatActivity {phoneNumber.setText(preferences.getSmsNumber());}+ timerDelay.setText(preferences.getTimerDelay()+"");+askForPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, 1);}@@ -186,6 +192,9 @@ public class SettingsActivity extends AppCompatActivity {EditText phoneNumber = (EditText)this.findViewById(R.id.phone_number);+ EditText timerDelay = (EditText)+ this.findViewById(R.id.timer_delay);+Spinner selectCameraSpinner = (Spinner) this.findViewById(R.id.camera_spinner);CheckBox smsCheck = (CheckBox) this.findViewById(R.id.sms_check);@@ -214,6 +223,8 @@ public class SettingsActivity extends AppCompatActivity {preferences.activateSms(false);}+ preferences.setTimerDelay(Integer.parseInt(timerDelay.getText().toString()));+launchMonitoringMode();}diff --git a/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java b/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.javaindex ddf95fc..20734a8 100644--- a/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java+++ b/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java@@ -71,8 +71,10 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapteLayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );holder.extra.setVisibility(View.VISIBLE);- AudioWife.getInstance().init(context, Uri.fromFile(new File(eventTrigger.getPath())))+ AudioWife audioWife = new AudioWife();+ audioWife.init(context, Uri.fromFile(new File(eventTrigger.getPath()))).useDefaultUi(holder.extra, inflater);+}}diff --git a/src/main/res/layout/activity_start.xml b/src/main/res/layout/activity_start.xmlindex c5ee6d9..e6a302e 100644--- a/src/main/res/layout/activity_start.xml+++ b/src/main/res/layout/activity_start.xml@@ -112,6 +112,22 @@android:paddingTop="10dp"/>+ <TextView+ android:id="@+id/timer_label"+ android:text="@string/timer_delay_label"+ android:layout_alignParentLeft="true"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:paddingTop="10dp"+ />+ <EditText+ android:id="@+id/timer_delay"+ android:inputType="numberDecimal"+ android:layout_centerHorizontal="true"+ android:layout_width="fill_parent"+ android:layout_height="wrap_content"+ android:paddingTop="10dp"+ /></LinearLayout></LinearLayout>\ No newline at end of filediff --git a/src/main/res/layout/layout_running.xml b/src/main/res/layout/layout_running.xmlindex f66050d..dd8d651 100644--- a/src/main/res/layout/layout_running.xml+++ b/src/main/res/layout/layout_running.xml@@ -6,14 +6,10 @@android:layout_width="match_parent"android:layout_height="match_parent">- <TextView- android:id="@+id/timer_text"+ <FrameLayoutandroid:layout_width="match_parent"- android:layout_height="match_parent"- android:gravity="center"- android:textSize="120dp"- android:text=""- />+ android:layout_height="match_parent">+<fragment class="info.guardianproject.phoneypot.ui.CameraFragment"android:id="@+id/fragment_camera"@@ -21,7 +17,16 @@android:layout_height="match_parent"android:visibility="gone"/>-+ <TextView+ android:id="@+id/timer_text"+ android:layout_width="match_parent"+ android:layout_height="match_parent"+ android:gravity="center"+ android:textSize="120dp"+ android:text=""+ android:background="@android:color/white"+ />+ </FrameLayout><android.support.design.widget.FloatingActionButtonandroid:id="@+id/fab_cancel"diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xmlindex 4cd24e3..781b619 100644--- a/src/main/res/values/strings.xml+++ b/src/main/res/values/strings.xml@@ -20,6 +20,9 @@Set camera motion sensitivity</string>+ <string name="timer_delay_label">+ Set the start delay time (seconds)+ </string><string name="microphone_label">Use microphone to detect any sound@@ -69,94 +72,6 @@<string name="intrusion_detected">An intrusion was detected. Capturing audio and photo evidence now.</string><string name="title_activity_event">EventActivity</string>- <string name="large_text">- "Material is the metaphor.\n\n"-- "A material metaphor is the unifying theory of a rationalized space and a system of motion."- "The material is grounded in tactile reality, inspired by the study of paper and ink, yet "- "technologically advanced and open to imagination and magic.\n"- "Surfaces and edges of the material provide visual cues that are grounded in reality. The "- "use of familiar tactile attributes helps users quickly understand affordances. Yet the "- "flexibility of the material creates new affordances that supercede those in the physical "- "world, without breaking the rules of physics.\n"- "The fundamentals of light, surface, and movement are key to conveying how objects move, "- "interact, and exist in space and in relation to each other. Realistic lighting shows "- "seams, divides space, and indicates moving parts.\n\n"-- "Bold, graphic, intentional.\n\n"-- "The foundational elements of print based design typography, grids, space, scale, color, "- "and use of imagery guide visual treatments. These elements do far more than please the "- "eye. They create hierarchy, meaning, and focus. Deliberate color choices, edge to edge "- "imagery, large scale typography, and intentional white space create a bold and graphic "- "interface that immerse the user in the experience.\n"- "An emphasis on user actions makes core functionality immediately apparent and provides "- "waypoints for the user.\n\n"-- "Motion provides meaning.\n\n"-- "Motion respects and reinforces the user as the prime mover. Primary user actions are "- "inflection points that initiate motion, transforming the whole design.\n"- "All action takes place in a single environment. Objects are presented to the user without "- "breaking the continuity of experience even as they transform and reorganize.\n"- "Motion is meaningful and appropriate, serving to focus attention and maintain continuity. "- "Feedback is subtle yet clear. Transitions are efficient yet coherent.\n\n"-- "3D world.\n\n"-- "The material environment is a 3D space, which means all objects have x, y, and z "- "dimensions. The z-axis is perpendicularly aligned to the plane of the display, with the "- "positive z-axis extending towards the viewer. Every sheet of material occupies a single "- "position along the z-axis and has a standard 1dp thickness.\n"- "On the web, the z-axis is used for layering and not for perspective. The 3D world is "- "emulated by manipulating the y-axis.\n\n"-- "Light and shadow.\n\n"-- "Within the material environment, virtual lights illuminate the scene. Key lights create "- "directional shadows, while ambient light creates soft shadows from all angles.\n"- "Shadows in the material environment are cast by these two light sources. In Android "- "development, shadows occur when light sources are blocked by sheets of material at "- "various positions along the z-axis. On the web, shadows are depicted by manipulating the "- "y-axis only. The following example shows the card with a height of 6dp.\n\n"-- "Resting elevation.\n\n"-- "All material objects, regardless of size, have a resting elevation, or default elevation "- "that does not change. If an object changes elevation, it should return to its resting "- "elevation as soon as possible.\n\n"-- "Component elevations.\n\n"-- "The resting elevation for a component type is consistent across apps (e.g., FAB elevation "- "does not vary from 6dp in one app to 16dp in another app).\n"- "Components may have different resting elevations across platforms, depending on the depth "- "of the environment (e.g., TV has a greater depth than mobile or desktop).\n\n"-- "Responsive elevation and dynamic elevation offsets.\n\n"-- "Some component types have responsive elevation, meaning they change elevation in response "- "to user input (e.g., normal, focused, and pressed) or system events. These elevation "- "changes are consistently implemented using dynamic elevation offsets.\n"- "Dynamic elevation offsets are the goal elevation that a component moves towards, relative "- "to the component’s resting state. They ensure that elevation changes are consistent "- "across actions and component types. For example, all components that lift on press have "- "the same elevation change relative to their resting elevation.\n"- "Once the input event is completed or cancelled, the component will return to its resting "- "elevation.\n\n"-- "Avoiding elevation interference.\n\n"-- "Components with responsive elevations may encounter other components as they move between "- "their resting elevations and dynamic elevation offsets. Because material cannot pass "- "through other material, components avoid interfering with one another any number of ways, "- "whether on a per component basis or using the entire app layout.\n"- "On a component level, components can move or be removed before they cause interference. "- "For example, a floating action button (FAB) can disappear or move off screen before a "- "user picks up a card, or it can move if a snackbar appears.\n"- "On the layout level, design your app layout to minimize opportunities for interference. "- "For example, position the FAB to one side of stream of a cards so the FAB won’t interfere "- "when a user tries to pick up one of cards.\n\n"- </string>+<string name="action_settings">Settings</string></resources>\ No newline at end of file