diff --git a/app/src/main/java/com/speedyapps/keepyousafe/MainActivity.java b/app/src/main/java/com/speedyapps/keepyousafe/MainActivity.java index 7e96038d83382bc0ecf68ef038d9af717969645b..b520fe88bde843d746e35643caee6c328e5293da 100644 --- a/app/src/main/java/com/speedyapps/keepyousafe/MainActivity.java +++ b/app/src/main/java/com/speedyapps/keepyousafe/MainActivity.java @@ -58,26 +58,18 @@ public class MainActivity extends AppCompatActivity { ImageButton help = (ImageButton)findViewById(R.id.helpButton); help.setOnLongClickListener(new View.OnLongClickListener(){ public boolean onLongClick(View v){ - onClick(); + backCount=0; + startActivity(intent); + finish(); return true; } }); } - public void onClick(){ - backCount=0; - Log.i("zz",""+choice); - switch(choice) { - case 0: - startActivity(intent); - break; - case 1: stopService(intent); - break; - } - choice=(choice+1)%2; - } + + public void contact(View v) { diff --git a/app/src/main/java/com/speedyapps/keepyousafe/alarmService.java b/app/src/main/java/com/speedyapps/keepyousafe/alarmService.java index cb6274dd89aca27d66f00ad8acc32ee4206667e0..e523c97036ff5f2d057f51af61c79bc9789c85b1 100644 --- a/app/src/main/java/com/speedyapps/keepyousafe/alarmService.java +++ b/app/src/main/java/com/speedyapps/keepyousafe/alarmService.java @@ -4,6 +4,7 @@ import android.app.Service; import android.content.Intent; import android.media.AudioManager; import android.media.MediaPlayer; +import android.os.Handler; import android.os.IBinder; import android.provider.MediaStore; import android.widget.MediaController; @@ -24,6 +25,15 @@ public class alarmService extends Service { super.onCreate(); mediaPlayer = MediaPlayer.create(this,R.raw.danger); forceFullVolume(); + final Handler handler = new Handler(); + Runnable run = new Runnable() { + @Override + public void run() { + forceFullVolume(); + handler.postDelayed(this,1000); + } + }; + handler.post(run); } @Override diff --git a/app/src/main/java/com/speedyapps/keepyousafe/confirmationScreen.java b/app/src/main/java/com/speedyapps/keepyousafe/confirmationScreen.java index 03a4a297067a763d66c95868e99c82709425936a..f6e56e10c8d6874b525703a6cb67cbe0e353f491 100644 --- a/app/src/main/java/com/speedyapps/keepyousafe/confirmationScreen.java +++ b/app/src/main/java/com/speedyapps/keepyousafe/confirmationScreen.java @@ -63,6 +63,7 @@ public class confirmationScreen extends AppCompatActivity { Toast.makeText(confirmationScreen.this, "Distress Calls Cancelled!", Toast.LENGTH_SHORT).show(); Intent main = new Intent(confirmationScreen.this,MainActivity.class); startActivity(main); + finish(); } else handler2.postDelayed(this,100); @@ -98,6 +99,10 @@ public class confirmationScreen extends AppCompatActivity { { SmsManager sms = SmsManager.getDefault(); sms.sendTextMessage(phoneNumber, null, message, null, null); + } + @Override + public void onBackPressed() { + Toast.makeText(this, "Please Enter the PIN CODE in order to Go Back!!!", Toast.LENGTH_SHORT).show(); } }