diff --git a/app/app-release.apk b/app/app-release.apk index d20a40e..af798d3 100644 Binary files a/app/app-release.apk and b/app/app-release.apk differ diff --git a/app/build.gradle b/app/build.gradle index ed717ae..8f9c974 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ android { applicationId "org.deke.risk.riskahead" minSdkVersion 15 targetSdkVersion 22 - versionCode 6 - versionName "1.5" + versionCode 8 + versionName "1.5.2" } buildTypes { release { 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 ad73317..1d0a5af 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 @@ -124,7 +124,7 @@ public class ProfileStatisticsFragment extends Fragment { } - if(uid != parent.user.get(SessionManager.KEY_UID)){ + if(uid != parent.user.get(SessionManager.KEY_UID) ){ lblPoints.setText(jObj.getString("username")+" "+getResources().getString(R.string.lbl_profile_points_someone)); lblPosts.setText(getResources().getString(R.string.lbl_profile_numofposts_me)); lblRanking.setText(getResources().getString(R.string.lbl_profile_ranking_someone)); diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_5_Fragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_5_Fragment.java index ae6a663..e6c140a 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_5_Fragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_5_Fragment.java @@ -25,8 +25,8 @@ public class ReportWF_5_Fragment extends Fragment { private final static int SINGLE_PERSON = 1; private final static int SMALL_GROUP = 2; private final static int BIG_GROUP = 3; - private final static int ETC = 4; - private final static int DONTKNOW = 5; + private final static int ETC = 5; + private final static int DONTKNOW = 4; private View viewFragment; diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_7_Fragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_7_Fragment.java index 4e75f1b..aed56fd 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_7_Fragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_7_Fragment.java @@ -25,8 +25,8 @@ public class ReportWF_7_Fragment extends Fragment { private final static int LOCAL = 1; private final static int TOURIST = 2; private final static int FOREIGNER = 3; - private final static int ETC = 4; - private final static int DONTKNOW = 5; + private final static int ETC = 5; + private final static int DONTKNOW = 4; private View viewFragment; 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 a0c5820..4b08b57 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 @@ -410,7 +410,7 @@ public class IncidentReport implements ClusterItem { } if(this.fidSuspectCategory == 4 || this.fidSuspectCategory == 5 || this.fidSuspectCategory == 6) { - returnValue += " ("+context.getResources().getStringArray(R.array.cat_suspect_sub_location)[this.fidSuspectSubCategory]+")"; + returnValue += " ("+context.getResources().getStringArray(R.array.cat_suspect_sub_location)[this.fidSuspectSubCategory-1]+")"; } return returnValue;