From c4b4514f94145dc7fb561af3a6ebc1c78da931e3 Mon Sep 17 00:00:00 2001
From: viveksvdy2014 <viveksp.ac@gmail.com>
Date: Sat, 18 Feb 2017 10:30:44 +0530
Subject: [PATCH] Made OIN Accepting Automatic ''
---
.../keepyousafe/confirmationScreen.java | 25 +++++++++++++++++--
.../layout/activity_confirmation_screen.xml | 14 +----------
2 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/com/speedyapps/keepyousafe/confirmationScreen.java b/app/src/main/java/com/speedyapps/keepyousafe/confirmationScreen.java
index 425b8c8..11a77e2 100644
--- a/app/src/main/java/com/speedyapps/keepyousafe/confirmationScreen.java
+++ b/app/src/main/java/com/speedyapps/keepyousafe/confirmationScreen.java
@@ -24,14 +24,15 @@ public class confirmationScreen extends AppCompatActivity {
public static String file1 = "MyPREFERENCES";
public static String file2 = "PREFERENCES";
public static String file3 = "COUNT";
- Handler handler;
+ Handler handler,handler2;
Intent alarmIntent ;
- Runnable run;
+ Runnable run,run2;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_confirmation_screen);
handler=new Handler();
+ handler2 = new Handler();
alarmIntent = new Intent(confirmationScreen.this,alarmService.class);
textView= (TextView)findViewById(R.id.countDown);
editText=(EditText)findViewById(R.id.editTextPIN);
@@ -51,7 +52,27 @@ public class confirmationScreen extends AppCompatActivity {
handler.postDelayed(this,1000);
}
};
+ run2=new Runnable() {
+ @Override
+ public void run() {
+ if((!editText.getText().toString().equals("2020"))&&textView.getText().toString().equals("0")) {
+ distressCall();
+ }
+ else if(editText.getText().toString().equals("2020")){
+ handler.removeCallbacks(run);
+ handler2.removeCallbacks(this);
+ Toast.makeText(confirmationScreen.this, "Distress Calls Cancelled!", Toast.LENGTH_SHORT).show();
+ Intent main = new Intent(confirmationScreen.this,MainActivity.class);
+ stopService(alarmIntent);
+ startActivity(main);
+ }
+ else if ((!editText.getText().toString().equals("2020")))
+ handler2.post(this);
+ }
+ };
+ handler2.post(run2);
handler.post(run);
+
}
public void onCancel(View view){
diff --git a/app/src/main/res/layout/activity_confirmation_screen.xml b/app/src/main/res/layout/activity_confirmation_screen.xml
index 38cd7ca..87e39cf 100644
--- a/app/src/main/res/layout/activity_confirmation_screen.xml
+++ b/app/src/main/res/layout/activity_confirmation_screen.xml
@@ -49,20 +49,8 @@
android:textStyle="normal|bold"
android:textColor="@android:color/holo_red_dark" />
- <Button
- android:text="CANCEL"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="15dp"
- android:id="@+id/buttonCANCEL"
- android:layout_below="@+id/editTextPIN"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- style="@android:style/Widget.Holo.Button"
- android:onClick="onCancel" />
-
<TextView
- android:text="If this is a FALSEALARM OR ACCIDENT, please ENTER THE PIN AND press CANCEL!"
+ android:text="If this is a FALSEALARM OR ACCIDENT, please ENTER THE PIN to CANCEL!"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/textView3"
--
GitLab