dennisthiessen/RiskAhead-Android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Dennis Thießen
2017-06-10 12:04:00 +02:00
parent b79b5d7f3f
commit 8f94b075c2
14 changed files with 425 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

2
RiskAhead-Android.iml
View File

@@ -13,7 +13,7 @@
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="jdk" jdkName="JDK" jdkType="JavaSDK" />
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

3
app/app.iml
View File

@@ -92,6 +92,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
@@ -101,6 +102,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
@@ -145,6 +147,5 @@
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
<orderEntry type="library" exported="" name="iconics-core-2.8.2" level="project" />
<orderEntry type="library" exported="" name="android-android-25" level="project" />
</component>
</module>

6
app/build.gradle
View File

@@ -13,14 +13,14 @@ apply plugin: 'com.google.gms.google-services'
android {
compileSdkVersion 25
buildToolsVersion '25.0.0'
buildToolsVersion '25.0.2'
defaultConfig {
applicationId "org.deke.risk.riskahead"
minSdkVersion 15
targetSdkVersion 23
versionCode 35
versionName "2.1.1"
versionCode 42
versionName "3.0.2"
}
buildTypes {
release {

7
app/src/main/java/org/deke/risk/riskahead/LoginActivity.java
View File

@@ -22,7 +22,6 @@ import android.util.Patterns;
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.LinearLayout;
@@ -45,8 +44,6 @@ import com.android.volley.Response;
import com.android.volley.VolleyError;
import com.android.volley.toolbox.StringRequest;
import com.beardedhen.androidbootstrap.BootstrapButton;
import com.google.android.gms.plus.Plus;
import com.google.android.gms.plus.model.people.Person;
import java.util.HashMap;
import java.util.Map;
@@ -314,9 +311,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
@Override
protected Map<String, String> getParams() {
Map<String, String> params = new HashMap<>();
return params;
return new HashMap<>();
}
};
}

121
app/src/main/java/org/deke/risk/riskahead/MapsActivity.java
View File

@@ -31,6 +31,7 @@ import android.widget.TextView;
import com.android.volley.Request;
import com.android.volley.Response;
import com.android.volley.VolleyError;
import android.location.LocationListener;
import com.android.volley.toolbox.StringRequest;
@@ -70,11 +71,9 @@ import java.util.Locale;
import java.util.Map;
/**
*
* (C) Copyright 2016 RiskAhead (http://www.riskahead.net)
* Developer & Contributor: Dennis Thießen (dennis.thiessen@riskahead.net)
* Date of Release: 10.02.2016
*
*/
public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCallbacks<Cursor>,
ClusterManager.OnClusterItemInfoWindowClickListener<IncidentReport>, ClusterManager.OnClusterClickListener<IncidentReport>, ClusterManager.OnClusterItemClickListener<IncidentReport>, OnMapReadyCallback {
@@ -101,8 +100,10 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
private Marker markerShowingInfoWindow;
private IncidentReport clickedClusterItem;
protected LocationManager locationManager;
Location location;
private LocationManager locationManager;
private LocationListener locationListener;
private Location location;
private static final int MIN_DISTANCE_CHANGE_FOR_UPDATES = 10; // 10 meters
private static final int MIN_TIME_BW_UPDATES = 1000 * 60; // 1 minute
@@ -121,6 +122,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
super.onCreate(savedInstanceState);
userHasToBeLoggedIn();
if (session.getSubsPremium()) {
MIN_ZOOM_LEVEL = 7;
} else {
@@ -138,6 +140,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
public void onMapReady(GoogleMap googleMap) {
mMap = googleMap;
initMap();
handleIntent(getIntent());
initClustering();
}
@@ -155,14 +158,9 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
case MY_PERMISSIONS_REQUEST_LOCATION: {
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
Log.d(TAG, "Permission was granted by user");
try{
mMap.setMyLocationEnabled(true);
}catch (SecurityException e){
Log.e(TAG,"Security Exception:"+e.getMessage());
}
enableMyLocationButton();
getLocation();
} else {
Log.d(TAG, "Permission was not granted by user");
@@ -182,12 +180,6 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
new LatLng(19.410704, -99.132385), DEFAULT_ZOOM_LEVEL));
break;
}
try{
mMap.setMyLocationEnabled(false);
}catch (SecurityException e){
Log.e(TAG,"Security Exception:"+e.getMessage());
}
}
}
}
@@ -196,15 +188,17 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
private void initMap() {
Log.d(TAG, "Init Map");
mMap.getUiSettings().setZoomControlsEnabled(true);
mMap.setMinZoomPreference(MIN_ZOOM_LEVEL);
mMap.setOnMyLocationButtonClickListener(new GoogleMap.OnMyLocationButtonClickListener() {
@Override
public boolean onMyLocationButtonClick() {
getLocation();
return true;
return false;
}
});
enableMyLocationButton();
mMap.setOnMapClickListener(new GoogleMap.OnMapClickListener() {
@Override
public void onMapClick(LatLng point) {
@@ -254,7 +248,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
addButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
session.setLocation(Double.doubleToRawLongBits(markedLocation.latitude), Double.doubleToRawLongBits(markedLocation.longitude));
session.setManualLocation(Double.doubleToRawLongBits(markedLocation.latitude), Double.doubleToRawLongBits(markedLocation.longitude));
Log.d(TAG, "MARKED LOCATION: " + markedLocation.latitude + " " + markedLocation.longitude);
gotoSettingsActivity();
}
@@ -276,20 +270,11 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
}
public GoogleMap.OnCameraIdleListener getCameraChangeListener() {
return new GoogleMap.OnCameraIdleListener()
{
return new GoogleMap.OnCameraIdleListener() {
@Override
public void onCameraIdle()
{
public void onCameraIdle() {
mClusterManager.onCameraIdle();
CameraPosition position = mMap.getCameraPosition();
if((position.zoom < MIN_ZOOM_LEVEL) && !session.getSubsPremium()) {
mMap.animateCamera(CameraUpdateFactory.zoomTo(MIN_ZOOM_LEVEL));
showMessage(getString(R.string.txt_map_zoomoutpremium));
return;
}
current_zoom_level = position.zoom;
if (position.zoom > 13) {
@@ -384,7 +369,6 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
}
private void addIncidentMarkersOnMap(JSONArray incidents) {
mClusterManager.clearItems();
for (int i = 0; i < incidents.length(); i++) {
@@ -424,13 +408,10 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
.opacity(0.7)
.build();
mOverlay = mMap.addTileOverlay(new TileOverlayOptions().tileProvider(mProvider));
Log.d("HEATMAP", "HeatMap initialized");
} else {
mProvider.setWeightedData(heatMapPositions);
mOverlay.clearTileCache();
Log.d("HEATMAP", "HeatMap updated");
}
}
@@ -589,7 +570,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
}
} else {
String errorMsg = jObj.getString("error_msg");
Log.e(TAG, "Error getting incident details (server returned error): " + errorMsg);
Log.i(TAG, "Error getting incident details (server returned error): " + errorMsg);
showMessage(getResources().getString(R.string.txt_errormsg_getinfowindow));
}
} catch (JSONException e) {
@@ -617,9 +598,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
};
}
private class MyCustomAdapterForItems implements GoogleMap.InfoWindowAdapter {
private final View myContentsView;
MyCustomAdapterForItems() {
@@ -661,8 +640,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
}
private void handleIntent(Intent intent) {
if(Intent.ACTION_SEARCH.equals(intent.getAction()))
{
if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
String query = intent.getStringExtra(SearchManager.QUERY);
doSearch(query);
} else if (Intent.ACTION_VIEW.equals(intent.getAction())) {
@@ -678,12 +656,12 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
LatLng point = new LatLng(Double.parseDouble(latitude), Double.parseDouble(longitude));
mMap.animateCamera(CameraUpdateFactory.newLatLngZoom(point, DEFAULT_ZOOM_LEVEL));
if(getIntent().hasExtra(AppConfig.EXTRA_MAP_TYPE)) mMarker = mMap.addMarker(new MarkerOptions().position(point));
if (getIntent().hasExtra(AppConfig.EXTRA_MAP_TYPE))
mMarker = mMap.addMarker(new MarkerOptions().position(point));
} else {
LatLng myPosition = session.getLocation();
if ((myPosition != null) && (myPosition.latitude != 0.0) && (myPosition.longitude != 0.0))
{
if ((myPosition != null) && (myPosition.latitude != 0.0) && (myPosition.longitude != 0.0)) {
mMap.animateCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(myPosition.latitude, myPosition.longitude), DEFAULT_ZOOM_LEVEL));
} else {
getLocation();
@@ -698,7 +676,9 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
}
@Override
public boolean onClusterClick(Cluster<IncidentReport> cluster) { return false; }
public boolean onClusterClick(Cluster<IncidentReport> cluster) {
return false;
}
@Override
public void onClusterItemInfoWindowClick(IncidentReport incidentReport) {
@@ -746,7 +726,8 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
}
@Override
public void onLoaderReset(Loader<Cursor> arg0) {}
public void onLoaderReset(Loader<Cursor> arg0) {
}
@Override
public Loader<Cursor> onCreateLoader(int arg0, Bundle query) {
@@ -776,13 +757,16 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
}
@Override
public void onProviderDisabled(String provider) {}
public void onProviderDisabled(String provider) {
}
@Override
public void onProviderEnabled(String provider) {}
public void onProviderEnabled(String provider) {
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {}
public void onStatusChanged(String provider, int status, Bundle extras) {
}
}
private boolean isLocationEnabled() {
@@ -792,21 +776,15 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
public Location getLocation() {
//check for permission
if (ActivityCompat.checkSelfPermission(getApplicationContext(), android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(getApplicationContext(), android.Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED){
Log.d(TAG, "Permission for GPS not granted yet - ask for permission now");
if (ActivityCompat.checkSelfPermission(getApplicationContext(), android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(getApplicationContext(), android.Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
ActivityCompat.requestPermissions(this, new String[]{android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_COARSE_LOCATION}, MY_PERMISSIONS_REQUEST_LOCATION);
} else {
Log.d(TAG, "Permission for GPS granted - get position");
mMap.setMyLocationEnabled(true);
MapFragment mapFragment = (MapFragment) getFragmentManager().findFragmentById(R.id.frag_maps_map);
View locationButton = ((View) mapFragment.getView().findViewById(Integer.parseInt("1")).getParent()).findViewById(Integer.parseInt("2"));
RelativeLayout.LayoutParams rlp = (RelativeLayout.LayoutParams) locationButton.getLayoutParams();
rlp.setMargins(0, 200, 30, 30);
locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
locationListener = new MyLocationListener();
try {
locationManager = (LocationManager) getApplicationContext().getSystemService(LOCATION_SERVICE);
LocationListener locationListener = new MyLocationListener();
if (!isLocationEnabled()) {
showMessage("Please activate GPS in your android settings.");
@@ -822,7 +800,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
LocationManager.GPS_PROVIDER,
MIN_TIME_BW_UPDATES,
MIN_DISTANCE_CHANGE_FOR_UPDATES, locationListener);
Log.d("GPS Enabled", "GPS Enabled");
Log.d(TAG, "GPS location from GPS Service activated");
if (locationManager != null) {
location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
if (location != null) {
@@ -835,9 +813,9 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
Log.d(TAG, "Locationservice enabled - Network Provider Found");
locationManager.requestLocationUpdates(
LocationManager.NETWORK_PROVIDER,
22,
33, locationListener);
Log.d("Network", "Network");
MIN_TIME_BW_UPDATES,
MIN_DISTANCE_CHANGE_FOR_UPDATES, locationListener);
Log.d(TAG, "GPS location from Network Provider activated");
if (locationManager != null) {
location = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
if (location != null) {
@@ -858,6 +836,18 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
return location;
}
private void enableMyLocationButton() {
try{
mMap.setMyLocationEnabled(true);
MapFragment mapFragment = (MapFragment) getFragmentManager().findFragmentById(R.id.frag_maps_map);
View locationButton = ((View) mapFragment.getView().findViewById(Integer.parseInt("1")).getParent()).findViewById(Integer.parseInt("2"));
RelativeLayout.LayoutParams rlp = (RelativeLayout.LayoutParams) locationButton.getLayoutParams();
rlp.setMargins(0, 250, 30, 30);
}catch(SecurityException se){
ActivityCompat.requestPermissions(this, new String[]{android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_COARSE_LOCATION}, MY_PERMISSIONS_REQUEST_LOCATION);
}
}
@Override
public void onLoadFinished(Loader<Cursor> arg0, Cursor c) {
showLocations(c);
@@ -883,7 +873,16 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
@Override
protected void onPause() {
Log.d(TAG,"onPause executed: LM: "+(locationManager != null)+" LL: "+(locationListener!=null));
if(locationManager != null && locationListener != null) {
locationManager.removeUpdates(locationListener);
locationListener = null;
locationManager = null;
}
super.onPause();
if (showAdd) showAd();
}

1
app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java
View File

@@ -459,7 +459,6 @@ public class ReportWFActivity extends BaseActivity implements ReportWF_1_Fragmen
private void finishReportAndGotoMap(IncidentReport incident) {
resetStateAndIncident();
showAd();
gotoMapActivity(incident.getPosition().latitude + ":" + incident.getPosition().longitude);
}

99
app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_2_Fragment.java
View File

@@ -6,6 +6,9 @@ import android.support.v4.app.DialogFragment;
import android.app.TimePickerDialog;
import android.content.Context;
import android.os.Bundle;
import android.support.v4.app.FragmentManager;
import android.text.Editable;
import android.text.TextWatcher;
import android.text.format.DateFormat;
import android.view.LayoutInflater;
import android.view.View;
@@ -46,19 +49,22 @@ public class ReportWF_2_Fragment extends BaseReportWFFragment {
private Spinner timeCategory;
private Spinner timeSubCategory;
private EditText inputTimeFrom;
private EditText inputDateFrom;
private EditText inputTimeTo;
private EditText inputDateTo;
private static EditText inputTimeFrom;
private static EditText inputDateFrom;
private static EditText inputTimeTo;
private static EditText inputDateTo;
private EditText tmpInput;
private static EditText tmpInput;
private IncidentReport incident;
private OnInputFinishedListener mCallback;
private boolean tmpIsToDate = false;
private boolean tmpIsToTime = false;
public static boolean tmpIsToDate = false;
public static boolean tmpIsToTime = false;
private DialogFragment timePickerFragment;
private DialogFragment datePickerFragment;
public interface OnInputFinishedListener {
void onInputFinished(boolean finished);
@@ -194,6 +200,22 @@ public class ReportWF_2_Fragment extends BaseReportWFFragment {
@Override
public void onClick(View v) {
tmpInput = inputDateFrom;
tmpInput.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
checkIfFinished();
}
});
showDatePickerDialog();
}
});
@@ -202,6 +224,22 @@ public class ReportWF_2_Fragment extends BaseReportWFFragment {
@Override
public void onClick(View v) {
tmpInput = inputTimeFrom;
tmpInput.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
checkIfFinished();
}
});
showTimePickerDialog();
}
});
@@ -233,7 +271,7 @@ public class ReportWF_2_Fragment extends BaseReportWFFragment {
});
}
public class TimePickerFragment extends DialogFragment implements TimePickerDialog.OnTimeSetListener {
public static class TimePickerFragment extends DialogFragment implements TimePickerDialog.OnTimeSetListener {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -247,17 +285,22 @@ public class ReportWF_2_Fragment extends BaseReportWFFragment {
public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
tmpInput.setText(String.format("%02d:%02d",hourOfDay,minute));
checkIfFinished();
//checkIfFinished();
}
}
public void showTimePickerDialog() {
DialogFragment newFragment = new TimePickerFragment();
FragmentManager fm = getFragmentManager();
timePickerFragment = (TimePickerFragment) fm.findFragmentByTag("Pick Time");
newFragment.show(getActivity().getSupportFragmentManager(), "Pick Time");
if(timePickerFragment == null){
timePickerFragment = new TimePickerFragment();
}
public class DatePickerFragment extends DialogFragment implements DatePickerDialog.OnDateSetListener {
timePickerFragment.show(fm, "Pick Time");
}
public static class DatePickerFragment extends DialogFragment implements DatePickerDialog.OnDateSetListener {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -286,13 +329,20 @@ public class ReportWF_2_Fragment extends BaseReportWFFragment {
public void onDateSet(DatePicker view, int year, int month, int day) {
tmpInput.setText(String.format("%04d-%02d-%02d",year,month + 1,day));
checkIfFinished();
//checkIfFinished();
}
}
public void showDatePickerDialog() {
DialogFragment newFragment = new DatePickerFragment();
newFragment.show(getActivity().getSupportFragmentManager(), "Pick Date");
FragmentManager fm = getFragmentManager();
datePickerFragment = (DatePickerFragment) fm.findFragmentByTag("Pick Date");
if(datePickerFragment == null){
datePickerFragment = new DatePickerFragment();
}
datePickerFragment.show(fm, "Pick Date");
}
private void checkIfFinished(){
@@ -361,6 +411,25 @@ public class ReportWF_2_Fragment extends BaseReportWFFragment {
checkIfFinished();
}
@Override
public void onStop() {
super.onStop();
//invalidate the DialogFragment to avoid stupid memory leak
if (timePickerFragment != null) {
if (timePickerFragment.isVisible()) {
timePickerFragment.dismiss();
}
timePickerFragment = null;
}
if (datePickerFragment != null) {
if (datePickerFragment.isVisible()) {
datePickerFragment.dismiss();
}
datePickerFragment = null;
}
}
@Override
public void onPause() {
super.onPause();

6
app/src/main/java/org/deke/risk/riskahead/fragment/SettingsFragment.java
View File

@@ -128,7 +128,9 @@ public class SettingsFragment extends PreferenceFragment {
prefLocation.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
if (session.getLocation().longitude != 0.0 && session.getLocation().latitude != 0.0) {
if (session.getManualLocation().longitude != 0.0 && session.getManualLocation().latitude != 0.0) {
((SettingsActivity) getActivity()).getNotifyLocationFromMapActivity(Double.toString(session.getManualLocation().latitude) + " : " + Double.toString(session.getManualLocation().longitude));
} else if(session.getLocation().longitude != 0.0 && session.getLocation().latitude != 0.0){
((SettingsActivity) getActivity()).getNotifyLocationFromMapActivity(Double.toString(session.getLocation().latitude) + " : " + Double.toString(session.getLocation().longitude));
} else {
((SettingsActivity) getActivity()).getNotifyLocationFromMapActivity();
@@ -218,7 +220,7 @@ public class SettingsFragment extends PreferenceFragment {
prefRadius.setValue(Integer.toString(session.getNotificationRadius()));
prefRadius.setSummary(prefRadius.getEntry());
prefGPSENabled.setChecked(session.isGPSForNotificationsEnabled());
prefLocation.setSummary(getResources().getString(R.string.txt_settings_gps_loca_sum)+":\n"+Double.toString(session.getLocation().latitude)+" : "+Double.toString(session.getLocation().longitude));
prefLocation.setSummary(getResources().getString(R.string.txt_settings_gps_loca_sum)+":\n"+Double.toString(session.getManualLocation().latitude)+" : "+Double.toString(session.getManualLocation().longitude));
if(session.getSubsPremium()){
if(session.isGPSForNotificationsEnabled()){

28
app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java
View File

@@ -71,11 +71,9 @@ import java.util.Locale;
import java.util.Map;
/**
*
* (C) Copyright 2016 RiskAhead (http://www.riskahead.net)
* Developer & Contributor: Dennis Thießen (dennis.thiessen@riskahead.net)
* Date of Release: 10.02.2016
*
*/
public abstract class BaseActivity extends AppCompatActivity {
@@ -137,14 +135,11 @@ public abstract class BaseActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
onStartCount = 1;
if (savedInstanceState == null)
{
if (savedInstanceState == null) {
this.overridePendingTransition(R.anim.slide_in_left,
R.anim.slide_out_left);
} else
{
} else {
onStartCount = 2;
}
@@ -163,14 +158,7 @@ public abstract class BaseActivity extends AppCompatActivity {
initNavigationDrawer(savedInstanceState);
if(!isMyNotificationServiceRunning() && session.getNotificationEnabled()){
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
ActivityCompat.requestPermissions(this,new String[]{Manifest.permission.ACCESS_FINE_LOCATION,Manifest.permission.ACCESS_COARSE_LOCATION},1);
return;
}
if (!isMyNotificationServiceRunning()) {
Log.d(TAG, "onCreate: NotificationService not running. Starting service...");
Intent wtdSServiceIntent = new Intent(this, NotificationService.class);
@@ -184,7 +172,6 @@ public abstract class BaseActivity extends AppCompatActivity {
am.setInexactRepeating(AlarmManager.RTC, firstStart, interval,
wtdSServicePendingIntent);
Log.d(TAG, "AlarmManager set");
startService(new Intent(this, NotificationService.class));
} else {
@@ -213,7 +200,6 @@ public abstract class BaseActivity extends AppCompatActivity {
protected void onResume() {
super.onResume();
registerBroadcastReceiver();
}
public void registerBroadcastReceiver() {
@@ -357,7 +343,6 @@ public abstract class BaseActivity extends AppCompatActivity {
}).build();
}
private void requestNewInterstitial() {
@@ -367,19 +352,17 @@ public abstract class BaseActivity extends AppCompatActivity {
}
public void showAd() {
if(System.currentTimeMillis() == 0) session.setLastAddShown(System.currentTimeMillis());
if (session.getLastAddShown() == 0) session.setLastAddShown(System.currentTimeMillis());
if(System.currentTimeMillis() > session.getLastAddShown()+120000){
if (System.currentTimeMillis() > (session.getLastAddShown() + 120000)) {
Log.d(TAG, "SHOW ADD!");
if (mInterstitialAd.isLoaded()) {
Log.d(TAG, "Loading Add...");
if (!(session.getSubsNoAds() || session.getSubsPremium())) {
mInterstitialAd.show();
session.setLastAddShown(System.currentTimeMillis());
} else {
Log.d(TAG, "Add not shown because user has status.");
}
@@ -795,5 +778,4 @@ public abstract class BaseActivity extends AppCompatActivity {
}
}

86
app/src/main/java/org/deke/risk/riskahead/helper/NotificationService.java
View File

@@ -51,11 +51,16 @@ public class NotificationService extends Service {
private static final int MIN_DISTANCE_CHANGE_FOR_UPDATES = 10; // 10 meters
private static final int MIN_TIME_BW_UPDATES = 1000 * 60; // 1 minute
private static int gpscounter = 0;
public SessionManager session;
public HashMap<String, String> user;
public LocationManager locationManager;
private LocationManager locationManager;
private LocationListener locationListener;
private LatLng myPosition;
public NotificationService() {
super();
@@ -63,17 +68,23 @@ public class NotificationService extends Service {
@Override
public void onCreate() {
Log.d(TAG, "onCreate NotificationService");
mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
session = new SessionManager(getApplicationContext());
user = session.getUserDetails();
locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
LocationListener locationListener = new MyLocationListener();
Log.d(TAG, "NotificationService created. Starting notification task...");
mNotifyTask.run();
}
private void initAndGetPosition() {
Log.d(TAG,"Trying to get a position. GPS enabled: "+session.isGPSForNotificationsEnabled());
if(session.isGPSForNotificationsEnabled()) {
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
locationListener = new MyLocationListener();
if (locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
Log.d(TAG, "Locationservice enabled - GPS Provider Found");
@@ -81,12 +92,16 @@ public class NotificationService extends Service {
LocationManager.GPS_PROVIDER,
MIN_TIME_BW_UPDATES,
MIN_DISTANCE_CHANGE_FOR_UPDATES, locationListener);
Log.d("GPS Enabled", "GPS Enabled");
Log.d(TAG, "GPS Provider enabled");
if (locationManager != null) {
Location tmpLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
if (tmpLocation != null) {
Log.d(TAG,"Last known position found from GPS Provider");
removeLocationListener();
session.setLocation(Double.doubleToRawLongBits(tmpLocation.getLatitude()), Double.doubleToRawLongBits(tmpLocation.getLongitude()));
myPosition = session.getLocation();
session.setNotificationServiceReady(true);
}
}
} else if (locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
@@ -94,44 +109,46 @@ public class NotificationService extends Service {
Log.d(TAG, "Locationservice enabled - Network Provider Found");
locationManager.requestLocationUpdates(
LocationManager.NETWORK_PROVIDER,
22,
33, locationListener);
Log.d("Network", "Network");
MIN_TIME_BW_UPDATES,
MIN_DISTANCE_CHANGE_FOR_UPDATES, locationListener);
Log.d(TAG, "Network Provider enabled");
if (locationManager != null) {
Location tmpLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
if (tmpLocation != null) {
Log.d(TAG,"Last known position found from Network Provider");
removeLocationListener();
session.setLocation(Double.doubleToRawLongBits(tmpLocation.getLatitude()), Double.doubleToRawLongBits(tmpLocation.getLongitude()));
myPosition = session.getLocation();
session.setNotificationServiceReady(true);
}
}
}
locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 5000, 10, locationListener);
}
}else{
myPosition = session.getManualLocation();
}
}
Log.d(TAG, "Service Created. Starting notification task...");
mNotifyTask.run();
private void removeLocationListener() {
if(locationManager != null && locationListener != null){
locationManager.removeUpdates(locationListener);
locationListener = null;
locationManager = null;
}
}
private class MyLocationListener implements LocationListener {
@Override
public void onLocationChanged(Location loc) {
if(session.isGPSForNotificationsEnabled() && loc.getLongitude() != 0.0 && loc.getLatitude() != 0.0) {
Log.d(TAG, "Save GPS as new location...");
if(session.getLocation() == null || session.getLocation().latitude == 0.0 || session.getLocation().longitude == 0.0){
Log.d(TAG,"onLocationChanged: "+gpscounter);
session.setLocation(Double.doubleToRawLongBits(loc.getLatitude()), Double.doubleToRawLongBits(loc.getLongitude()));
mNotifyHandler.removeCallbacksAndMessages(null);
mNotifyTask.run();
}else{
session.setLocation(Double.doubleToRawLongBits(loc.getLatitude()), Double.doubleToRawLongBits(loc.getLongitude()));
}
session.setNotificationServiceReady(true);
}else{
Log.d(TAG,"Don't Save GPS as new location because GPS for notifications is disabled...: "+session.isGPSForNotificationsEnabled());
if(gpscounter > 3){
removeLocationListener();
}
gpscounter++;
}
@Override
@@ -154,14 +171,15 @@ public class NotificationService extends Service {
public void run() {
android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND);
LatLng myPosition = session.getLocation();
boolean notifyEnabled = session.getNotificationEnabled();
int radius = session.getNotificationRadius();
int pollFrequency = session.getNotificationPollFreq() * 1000 * 60;
boolean notifyEnabled = session.getNotificationEnabled();
Log.d(this.toString(), "Run Notification Task. Notifications enabled = " + notifyEnabled);
if(notifyEnabled && session.isLoggedIn()){
initAndGetPosition();
if ((myPosition != null) && (myPosition.latitude != 0.0) && (myPosition.longitude != 0.0)) {
session.setNotificationServiceReady(true);
String lastNotificationTime;
@@ -172,7 +190,7 @@ public class NotificationService extends Service {
lastNotificationTime = session.getLastNotification();
}
Log.d(this.toString(), "Lookup location with position: " + myPosition + " Radius: "+ radius +" PollFrequency: "+ pollFrequency +" lastNotifyTime: " + lastNotificationTime);
Log.d(this.toString(), "Lookup location with position: " + myPosition + " Radius: "+ radius +" PollFrequency: "+ pollFrequency +" lastNotifyTime: " + lastNotificationTime + " GPSActivated: "+session.isGPSForNotificationsEnabled());
StringRequest strReq = getStringRequestIncidentsFromAreaAndTime(myPosition.latitude, myPosition.longitude, radius, lastNotificationTime);
String tag_string_req = "req_incidents";
@@ -272,18 +290,16 @@ public class NotificationService extends Service {
);
mBuilder.setContentIntent(resultPendingIntent);
int mId = 1;
mNotificationManager.notify(mId, mBuilder.build());
mNotificationManager.notify(1, mBuilder.build());
session.setLastNotification(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(Calendar.getInstance().getTime()));
}
@Override
public void onDestroy(){
if(locationManager != null && locationListener != null) locationManager.removeUpdates(locationListener);
super.onDestroy();
Log.d(TAG, "Destroy NotificationService");
}
}

13
app/src/main/java/org/deke/risk/riskahead/helper/SessionManager.java
View File

@@ -49,6 +49,9 @@ public class SessionManager {
public static final String KEY_LOCATION_LAT = "location_latitude";
public static final String KEY_LOCATION_LNG = "location_longitude";
public static final String KEY_MAN_LOCATION_LAT = "man_location_latitude";
public static final String KEY_MAN_LOCATION_LNG = "man_location_longitude";
public static final String KEY_LAST_NOTIFICATION = "lastNotificationTime";
public static final String KEY_NOTIFY_ENABLED = "notifyEnabled" ;
public static final String KEY_NOTIFY_RADIUS = "notifyRadius";
@@ -88,6 +91,16 @@ public class SessionManager {
return new LatLng(Double.longBitsToDouble(status.getLong(KEY_LOCATION_LAT, 0)), Double.longBitsToDouble(status.getLong(KEY_LOCATION_LNG, 0)));
}
public void setManualLocation(Long latitude, Long longitude){
statusEditor.putLong(KEY_MAN_LOCATION_LAT, latitude);
statusEditor.putLong(KEY_MAN_LOCATION_LNG, longitude);
statusEditor.apply();
}
public LatLng getManualLocation(){
return new LatLng(Double.longBitsToDouble(status.getLong(KEY_MAN_LOCATION_LAT, 0)), Double.longBitsToDouble(status.getLong(KEY_MAN_LOCATION_LNG, 0)));
}
public void setGPSForNotificationsEnabled(boolean isEnabled){
statusEditor.putBoolean(KEY_NOTIFY_GPS, isEnabled);
statusEditor.apply();

52
app/src/main/res/values-de/strings.xml
View File

@@ -248,43 +248,43 @@
</string-array>
<string-array name="cat_situation_sub_threat">
<item>Robbery</item>
<item>Drug related</item>
<item>Strike/Riot</item>
<item>Überfall</item>
<item>Drogenkriminalität</item>
<item>Streik/Aufstand</item>
<item>Checkpoint/Blockade</item>
<item>Corruption/Extorsion</item>
<item>Korruption/Missbrauch</item>
</string-array>
<string-array name="cat_situation_sub_physical">
<item>Mugging</item>
<item>Sexual Assault</item>
<item>Physical Attack</item>
<item>Fight</item>
<item>Arrest/Capture</item>
<item>Forced Labour</item>
<item>Raubüberfall</item>
<item>Sexuelle Belästigung</item>
<item>Physischer Angriff</item>
<item>Kampf</item>
<item>Arrest/Übernahme</item>
<item>Zwangsarbeit</item>
</string-array>
<string-array name="cat_situation_sub_lifethreat">
<item>Rape</item>
<item>Kidnapping/Hostage</item>
<item>Shooting</item>
<item>Bombing</item>
<item>Murder</item>
<item>Dead body</item>
<item>Vergewaltigung</item>
<item>Geiselnahme</item>
<item>Schießerei</item>
<item>Bombenangriff</item>
<item>Mord</item>
<item>Leiche</item>
</string-array>
<string-array name="cat_situation_sub_disaster">
<item>Heat Wave</item>
<item>Cyclone/Tornado</item>
<item>Flood</item>
<item>Earthquake</item>
<item>Wild Fire</item>
<item>Volcano</item>
<item>Hitzewelle</item>
<item>Tornado</item>
<item>Flut</item>
<item>Erdbeben</item>
<item>Wildfeuer</item>
<item>Vulkanausbruch</item>
<item>Tsunami</item>
<item>Fire</item>
<item>Chemical/Oil Spill</item>
<item>Epidemic</item>
<item>Chaos/Anarchy</item>
<item>Feuer</item>
<item>Chemie-/Ölunfall</item>
<item>Epidemie</item>
<item>Chaos/Anarchie</item>
</string-array>
<string-array name="cat_time_main">

2
build.gradle
View File

@@ -6,7 +6,7 @@ buildscript {
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.android.tools.build:gradle:2.3.1'
classpath 'com.google.gms:google-services:1.3.0-beta3'
classpath 'io.fabric.tools:gradle:1.+'
}