diff --git a/app/app.iml b/app/app.iml index a5623fd..80f31ad 100644 --- a/app/app.iml +++ b/app/app.iml @@ -85,6 +85,7 @@ + @@ -132,32 +133,46 @@ - - - - + + + - - - - - - - - + + + + + + + + + + - - - - - + + + + - - + + + + + + + + + + + - + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 60c26aa..d2ec9bc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,6 +29,9 @@ android { debuggable false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + debug { + debuggable true + } } lintOptions { abortOnError false @@ -42,24 +45,28 @@ repositories { dependencies { compile fileTree(dir: 'libs', include: 'Parse-*.jar') + compile 'com.facebook.android:facebook-android-sdk:4.8.1' compile('com.twitter.sdk.android:twitter-core:1.4.1@aar') { transitive = true; } - compile('com.mikepenz:materialdrawer:4.6.4@aar') { + compile 'com.mikepenz:iconics-core:2.8.2@aar' + compile 'com.mikepenz:google-material-typeface:3.0.1.0.original@aar' + compile('com.mikepenz:materialdrawer:5.9.0@aar') { transitive = true } - compile 'com.android.support:appcompat-v7:23.1.1' - compile 'com.mikepenz:iconics-core:2.5.5@aar' - compile 'com.mikepenz:google-material-typeface:2.1.0.1.original@aar' - compile 'com.google.android.gms:play-services-gcm:8.4.0' - compile 'com.google.android.gms:play-services-plus:8.4.0' - compile 'com.google.android.gms:play-services-location:8.4.0' - compile 'com.google.android.gms:play-services-ads:8.4.0' - compile 'com.facebook.android:facebook-android-sdk:4.8.1' - compile 'com.beardedhen:androidbootstrap:2.0.1' + + compile 'com.android.support:appcompat-v7:25.3.1' + compile 'com.android.support:support-v4:25.3.1' + compile 'com.android.support:design:25.3.1' + + compile 'com.google.android.gms:play-services-gcm:10.2.1' + compile 'com.google.android.gms:play-services-plus:10.2.1' + compile 'com.google.android.gms:play-services-location:10.2.1' + compile 'com.google.android.gms:play-services-ads:10.2.1' + compile 'com.google.android.gms:play-services-maps:10.2.1' + compile 'com.google.maps.android:android-maps-utils:0.5' + + compile 'com.google.code.gson:gson:2.7' + compile 'com.beardedhen:androidbootstrap:2.3.1' compile 'com.mcxiaoke.volley:library:1.0.19' - compile 'com.android.support:design:23.1.1' - compile 'com.google.code.gson:gson:2.4' - compile 'com.google.maps.android:android-maps-utils:0.4' - compile 'com.android.support:support-v4:23.1.1' } diff --git a/app/src/main/java/org/deke/risk/riskahead/MainActivity.java b/app/src/main/java/org/deke/risk/riskahead/MainActivity.java index 34095b1..b497cf8 100644 --- a/app/src/main/java/org/deke/risk/riskahead/MainActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/MainActivity.java @@ -127,7 +127,7 @@ public class MainActivity extends BaseActivity{ } private StringRequest getStringRequestIncidentCount() { - return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { + return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener() { @Override public void onResponse(String response) { diff --git a/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java b/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java index 7ef89fe..b07dc97 100644 --- a/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java @@ -239,13 +239,14 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa }); } - public GoogleMap.OnCameraChangeListener getCameraChangeListener() { - return new GoogleMap.OnCameraChangeListener() + public GoogleMap.OnCameraIdleListener getCameraChangeListener() { + return new GoogleMap.OnCameraIdleListener() { @Override - public void onCameraChange(CameraPosition position) + public void onCameraIdle() { - mClusterManager.onCameraChange(position); + mClusterManager.onCameraIdle(); + CameraPosition position = mMap.getCameraPosition(); if((position.zoom < MIN_ZOOM_LEVEL) && !session.getSubsPremium()) { mMap.animateCamera(CameraUpdateFactory.zoomTo(MIN_ZOOM_LEVEL)); @@ -398,7 +399,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa } private StringRequest getStringRequestGetAllIncidentsForHeatMapFromBound(final LatLng northeast, final LatLng southwest) { - return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { + return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener() { @Override public void onResponse(String response) { @@ -446,7 +447,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa } private StringRequest getStringRequestGetAllIncidentsFromBound(final LatLng northeast, final LatLng southwest) { - return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { + return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener() { @Override public void onResponse(String response) { @@ -495,7 +496,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa private void initClustering() { mClusterManager = new ClusterManager<>(this, mMap); - mMap.setOnCameraChangeListener(getCameraChangeListener()); + mMap.setOnCameraIdleListener(getCameraChangeListener()); mClusterManager.setRenderer(new OwnIconRendered(MapsActivity.this, mMap, mClusterManager)); @@ -528,7 +529,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa } private StringRequest getStringRequestGetIncidentScoreForInfoWindow(final View infoView, final String incidentID) { - return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { + return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener() { @Override public void onResponse(String response) { diff --git a/app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java b/app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java index 20c9980..c883ea6 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java @@ -315,7 +315,7 @@ public class ReportWFActivity extends BaseActivity implements ReportWF_1_Fragmen private StringRequest getStringRequestAddIncidentWithPosition(final IncidentReport incident) { showDialog(); - return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { + return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener() { @Override public void onResponse(String response) { diff --git a/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java b/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java index d6b618b..560d0be 100644 --- a/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java @@ -309,7 +309,7 @@ public class SubscriptionsActivity extends BaseActivity{ } private StringRequest getStringAddSubscription(final String productId, final String type, final String price, final String currency) { - return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { + return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener() { @Override public void onResponse(String response) { @@ -365,7 +365,7 @@ public class SubscriptionsActivity extends BaseActivity{ } private StringRequest getStringGetSubscriptions(final String userId) { - return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { + return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener() { @Override public void onResponse(String response) { @@ -426,7 +426,7 @@ public class SubscriptionsActivity extends BaseActivity{ } private StringRequest getStringDeactivateSubscriptions(final String subscriptionId) { - return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { + return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener() { @Override public void onResponse(String response) { diff --git a/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java b/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java index 8991993..ce5da86 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java @@ -158,7 +158,7 @@ public class ViewReportActivity extends BaseActivity { } private StringRequest getStringRequestDeleteIncident(final Integer incidentid) { - return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { + return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener() { @Override public void onResponse(String response) { @@ -213,7 +213,7 @@ public class ViewReportActivity extends BaseActivity { } private StringRequest getStringRequestGetIncidentWithPositionFromID(final Integer incidentid) { - return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { + return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener() { @Override public void onResponse(String response) { @@ -447,7 +447,7 @@ public class ViewReportActivity extends BaseActivity { } private StringRequest getStringRequestAddVote(final Integer incidentid, final String votetype) { - return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { + return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener() { @Override public void onResponse(String response) { @@ -502,7 +502,7 @@ public class ViewReportActivity extends BaseActivity { } private StringRequest getStringRequestDeleteVote(final Integer incidentid) { - return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { + return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener() { @Override public void onResponse(String response) { diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/ProfileStatisticsFragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/ProfileStatisticsFragment.java index 70ee779..c240927 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragment/ProfileStatisticsFragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragment/ProfileStatisticsFragment.java @@ -86,7 +86,7 @@ public class ProfileStatisticsFragment extends Fragment { } private StringRequest getStringRequestProfileStats() { - return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { + return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener() { @Override public void onResponse(String response) { diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/ReportListFragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/ReportListFragment.java index 7e87e01..61282aa 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragment/ReportListFragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragment/ReportListFragment.java @@ -86,7 +86,7 @@ public class ReportListFragment extends Fragment{ } private StringRequest getStringRequestGetIncidentsWithPositionFromUserID() { - return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { + return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener() { @Override public void onResponse(String response) { diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/SettingsFragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/SettingsFragment.java index 6142333..9f5ba0d 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragment/SettingsFragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragment/SettingsFragment.java @@ -239,7 +239,7 @@ public class SettingsFragment extends PreferenceFragment { private StringRequest getStringRequestResetPW(final String email) { ((SettingsActivity) getActivity()).showDialog(); - return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { + return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener() { @Override public void onResponse(String response) { @@ -304,7 +304,7 @@ public class SettingsFragment extends PreferenceFragment { } private StringRequest getStringChangeUserSettings(final String username, final String name, final String surname, final String email) { - return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { + return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener() { @Override public void onResponse(String response) { diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/Top10Fragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/Top10Fragment.java index d08ca7d..b1c3f03 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragment/Top10Fragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragment/Top10Fragment.java @@ -79,7 +79,7 @@ public class Top10Fragment extends Fragment { private StringRequest getStringRequestTop10() { - return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { + return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener() { @Override public void onResponse(String response) { diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/AppConfig.java b/app/src/main/java/org/deke/risk/riskahead/helper/AppConfig.java index d4125ee..d55c04d 100644 --- a/app/src/main/java/org/deke/risk/riskahead/helper/AppConfig.java +++ b/app/src/main/java/org/deke/risk/riskahead/helper/AppConfig.java @@ -16,8 +16,8 @@ public class AppConfig { public final static String URL_ENCRYPTED = "https://www.riskahead.de/helper/rest/"; public final static String URL_DEFAULT = "http://www.riskahead.de/helper/rest/"; - public final static String URL_ABOUT = "http://www.riskahead.de/en/about/"; - public final static String URL_CONTACT = "http://www.riskahead.de/en/contact/"; + public final static String URL_ABOUT = "https://www.riskahead.net/about/"; + public final static String URL_CONTACT = "https://www.riskahead.net/contact/"; /** INTENT MESSAGES **/ public final static String EXTRA_MESSAGE = "org.deke.risk.riskahead.MESSAGE"; diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java b/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java index a673863..d2a6a78 100644 --- a/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java @@ -335,7 +335,7 @@ public abstract class BaseActivity extends AppCompatActivity { public boolean onItemClick(View view, int position, IDrawerItem drawerItem) { - switch (drawerItem.getIdentifier()) { + switch ((int)drawerItem.getIdentifier()) { case 1: gotoMainActivity(); return false; @@ -723,7 +723,7 @@ public abstract class BaseActivity extends AppCompatActivity { } private StringRequest getStringRequestSendFeedback(final String feedback, final String sysprop) { - return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { + return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener() { @Override public void onResponse(String response) { diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/IncidentReport.java b/app/src/main/java/org/deke/risk/riskahead/helper/IncidentReport.java index c583400..ad8b9f1 100644 --- a/app/src/main/java/org/deke/risk/riskahead/helper/IncidentReport.java +++ b/app/src/main/java/org/deke/risk/riskahead/helper/IncidentReport.java @@ -612,6 +612,16 @@ public class IncidentReport implements ClusterItem { return this.incidentPosition; } + @Override + public String getTitle() { + return "Title"; + } + + @Override + public String getSnippet() { + return "Snippet"; + } + public int getVotedScore(){ return this.votedScore; } diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/NotificationService.java b/app/src/main/java/org/deke/risk/riskahead/helper/NotificationService.java index a8ff2d2..afaf392 100644 --- a/app/src/main/java/org/deke/risk/riskahead/helper/NotificationService.java +++ b/app/src/main/java/org/deke/risk/riskahead/helper/NotificationService.java @@ -162,7 +162,7 @@ public class NotificationService extends Service { }; private StringRequest getStringRequestIncidentsFromAreaAndTime(final Double latitude, final Double longitude, final int radius, final String time) { - return new StringRequest(Request.Method.POST, AppConfig.URL_DEFAULT, new Response.Listener() { + return new StringRequest(Request.Method.POST, AppConfig.URL_ENCRYPTED, new Response.Listener() { @Override public void onResponse(String response) {