From 5c7557c68801be486ecf3c8c5d546c16143edefc Mon Sep 17 00:00:00 2001 From: root <viveksp.ac@gmail.com> Date: Sun, 23 Apr 2017 23:22:09 +0530 Subject: [PATCH] GPS functions finished --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 1 + .../keepyousafe/ContactSelection.java | 63 +++++++++---------- .../speedyapps/keepyousafe/MapsActivity.java | 7 +++ .../speedyapps/keepyousafe/SMSManager.java | 7 +-- .../keepyousafe/confirmationScreen.java | 21 +++++-- 6 files changed, 59 insertions(+), 41 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c81f848..15bb4ee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,4 +27,5 @@ dependencies { compile 'com.android.support:appcompat-v7:25.1.1' compile 'com.google.android.gms:play-services-maps:10.2.1' testCompile 'junit:junit:4.12' + compile fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5545918..9a296f4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ <uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.RECEIVE_SMS" /> <uses-permission android:name="android.permission.READ_SMS" /> + <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> diff --git a/app/src/main/java/com/speedyapps/keepyousafe/ContactSelection.java b/app/src/main/java/com/speedyapps/keepyousafe/ContactSelection.java index a7d302a..d75fcf7 100644 --- a/app/src/main/java/com/speedyapps/keepyousafe/ContactSelection.java +++ b/app/src/main/java/com/speedyapps/keepyousafe/ContactSelection.java @@ -176,54 +176,51 @@ public class ContactSelection extends Activity { public void delete(View v) { - int pos = l.getCheckedItemPosition(); - if (pos > -1) - { - try { - String b,b1 = null,b2; - b = a.get(pos).toString(); + try { + int pos = l.getCheckedItemPosition(); + if (pos > -1) { + try { + String b, b1 = null, b2; + b = a.get(pos).toString(); - String s11 = b.split("\\(")[0]; - Log.d("del", s11); + String s11 = b.split("\\(")[0]; + Log.d("del", s11); - Iterator iter = sp.getAll().entrySet().iterator(); + Iterator iter = sp.getAll().entrySet().iterator(); - { - while (iter.hasNext()) { - Map.Entry pair = (Map.Entry) iter.next(); - if (s11.equals(pair.getValue())) { - b1 = pair.getKey().toString(); - Log.d("b1", b1); + { + while (iter.hasNext()) { + Map.Entry pair = (Map.Entry) iter.next(); + if (s11.equals(pair.getValue())) { + b1 = pair.getKey().toString(); + Log.d("b1", b1); + } } - } - // Check the value here - - a.remove(pos); - - arr.notifyDataSetChanged(); - - sp.edit().remove(b1).commit(); - sharedpreferences.edit().remove(s11).commit(); + // Check the value here + a.remove(pos); + arr.notifyDataSetChanged(); + sp.edit().remove(b1).commit(); + sharedpreferences.edit().remove(s11).commit(); - Toast.makeText(this, "Deleted Successfully", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, "Deleted Successfully", Toast.LENGTH_SHORT).show(); + } + } catch (Exception e) { } - } catch (Exception e) { - } - - } - else - { - Toast.makeText(this, "Not Deleted", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(this, "Not Deleted", Toast.LENGTH_SHORT).show(); + } + arr.notifyDataSetChanged(); } - arr.notifyDataSetChanged(); + catch (Exception e){ + } } } diff --git a/app/src/main/java/com/speedyapps/keepyousafe/MapsActivity.java b/app/src/main/java/com/speedyapps/keepyousafe/MapsActivity.java index 3e64233..2e7aa61 100644 --- a/app/src/main/java/com/speedyapps/keepyousafe/MapsActivity.java +++ b/app/src/main/java/com/speedyapps/keepyousafe/MapsActivity.java @@ -26,6 +26,7 @@ public class MapsActivity extends FragmentActivity implements OnMapReadyCallback protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_maps); + sp=getSharedPreferences("locationinfo",MODE_PRIVATE); // Obtain the SupportMapFragment and get notified when the map is ready to be used. SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager() @@ -80,4 +81,10 @@ public class MapsActivity extends FragmentActivity implements OnMapReadyCallback mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(latitude,longitude),18)); } } + + @Override + public void onBackPressed() { + Intent main = new Intent(MapsActivity.this,MainActivity.class); + startActivity(main); + } } diff --git a/app/src/main/java/com/speedyapps/keepyousafe/SMSManager.java b/app/src/main/java/com/speedyapps/keepyousafe/SMSManager.java index 20bff89..4d75f00 100644 --- a/app/src/main/java/com/speedyapps/keepyousafe/SMSManager.java +++ b/app/src/main/java/com/speedyapps/keepyousafe/SMSManager.java @@ -54,13 +54,12 @@ public class SMSManager extends BroadcastReceiver { sp.edit().putString("latitude",latitudepart).putString("longitude",longitudepart).commit(); Log.i("lat","lat"+latitudepart); Intent mapsIntent = new Intent(context, MapsActivity.class); - //mapsIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - mapsIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); + mapsIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + //mapsIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); // if(!sp.getString("status","null").equals("running")) { - context.startActivity(mapsIntent); +// context.startActivity(mapsIntent); // } // if(sp.getString("status","null").equals("paused")){ -// context.stopService(mapsIntent); context.startActivity(mapsIntent); } } diff --git a/app/src/main/java/com/speedyapps/keepyousafe/confirmationScreen.java b/app/src/main/java/com/speedyapps/keepyousafe/confirmationScreen.java index 358ef5e..7e8a4cb 100644 --- a/app/src/main/java/com/speedyapps/keepyousafe/confirmationScreen.java +++ b/app/src/main/java/com/speedyapps/keepyousafe/confirmationScreen.java @@ -28,13 +28,15 @@ import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; +import com.google.android.gms.common.api.GoogleApiClient; + import org.w3c.dom.Text; import java.util.List; public class confirmationScreen extends AppCompatActivity implements LocationListener { - public static int SMS_SEND_INTERVAL=2000; + public static int SMS_SEND_INTERVAL=2*60*1000; LocationManager locationManager; TextView textView; EditText editText; @@ -55,6 +57,12 @@ public class confirmationScreen extends AppCompatActivity implements LocationLis super.onCreate(savedInstanceState); setContentView(R.layout.activity_confirmation_screen); locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE); + boolean enabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER); + if (!enabled) { + Toast.makeText(this, "Please Enable GPS to use KeepMeSafe", Toast.LENGTH_SHORT).show(); + Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS); + startActivity(intent); + } provider = locationManager.getProvider(LocationManager.GPS_PROVIDER); Toast.makeText(this, "Provider"+provider, Toast.LENGTH_SHORT).show(); handler = new Handler(); @@ -79,7 +87,7 @@ public class confirmationScreen extends AppCompatActivity implements LocationLis i--; if(i<=0) i=0; - handler.postDelayed(this, 100); + handler.postDelayed(this, 1000); } } }; @@ -97,7 +105,7 @@ public class confirmationScreen extends AppCompatActivity implements LocationLis startActivity(main); finish(); } else - handler2.postDelayed(this, 100); + handler2.postDelayed(this, 1000); } @@ -129,7 +137,7 @@ public class confirmationScreen extends AppCompatActivity implements LocationLis } } } - + locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,2000,1,this); run3 = new Runnable() { @Override public void run() { @@ -291,4 +299,9 @@ public class confirmationScreen extends AppCompatActivity implements LocationLis } return bestLocation; } + + public void requestLocationChange(){ + + } + } -- GitLab