diff --git a/app/app.iml b/app/app.iml
index fca2a6a..56250d7 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -96,6 +96,7 @@
+
diff --git a/app/build.gradle b/app/build.gradle
index 8229c19..8ad42fc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,8 +19,8 @@ android {
applicationId "org.deke.risk.riskahead"
minSdkVersion 15
targetSdkVersion 22
- versionCode 1
- versionName "1.0"
+ versionCode 2
+ versionName "1.1"
}
buildTypes {
release {
diff --git a/app/src/main/java/org/deke/risk/riskahead/SettingsActivity.java b/app/src/main/java/org/deke/risk/riskahead/SettingsActivity.java
index 47da52e..f488dc7 100644
--- a/app/src/main/java/org/deke/risk/riskahead/SettingsActivity.java
+++ b/app/src/main/java/org/deke/risk/riskahead/SettingsActivity.java
@@ -194,7 +194,7 @@ public class SettingsActivity extends BaseActivity {
if (!error) {
showMessage(jObj.getString("msg"));
JSONObject tmpuser = jObj.getJSONObject("user");
- session.addUser(jObj.getString("id"), tmpuser.getString("username"), tmpuser.getString("name"), tmpuser.getString("surname"), tmpuser.getString("email"), tmpuser.getString("status"), user.get("providerType"), tmpuser.getString("created_at"), tmpuser.getString("updated_at"), tmpuser.getString("lastlogin_at"), tmpuser.getString("token"));
+ session.addUser(tmpuser.getString("id"), tmpuser.getString("username"), tmpuser.getString("name"), tmpuser.getString("surname"), tmpuser.getString("email"), tmpuser.getString("status"), user.get("providerType"), tmpuser.getString("created_at"), tmpuser.getString("updated_at"), tmpuser.getString("lastlogin_at"), tmpuser.getString("accesskey"));
finish();
startActivity(getIntent());
} else {
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 9b9f903..0e391fc 100644
--- a/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java
+++ b/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java
@@ -34,10 +34,9 @@ public class SubscriptionsActivity extends BaseActivity implements ServiceConnec
btnPurchaseNoAds = (Button) findViewById(R.id.btn_subscription_1);
btnPurchaseExtraFunctions = (Button) findViewById(R.id.btn_subscription_2);
- Intent serviceIntent =
- new Intent("com.android.vending.billing.InAppBillingService.BIND");
- serviceIntent.setPackage("com.android.vending");
- bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
+ //Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
+ // serviceIntent.setPackage("com.android.vending");
+ //bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
// Bundle activeSubs = mService.getPurchases(3, "org.deke.risk.riskahead", "subs", continueToken);
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 02d4620..d179b6c 100644
--- a/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java
+++ b/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java
@@ -39,6 +39,7 @@ public class ViewReportActivity extends BaseActivity {
private EditText txtIncidentCategory;
private EditText txtIncidentSubCategory;
private EditText txtPosition;
+ private EditText txtTime;
private EditText txtSuspect;
private EditText txtWeapons;
private EditText txtNumOfSuspects;
@@ -60,6 +61,7 @@ public class ViewReportActivity extends BaseActivity {
txtIncidentCategory = (EditText) findViewById(R.id.txt_viewreport_incidentcategory);
txtIncidentSubCategory = (EditText) findViewById(R.id.txt_viewreport_incidentsubcategory);
txtPosition = (EditText) findViewById(R.id.txt_viewreport_position);
+ txtTime = (EditText) findViewById(R.id.txt_viewreport_time);
scorelabel = (BootstrapLabel) findViewById(R.id.txt_viewreport_points);
txtSuspect = (EditText) findViewById(R.id.txt_viewreport_suspect);
txtWeapons = (EditText) findViewById(R.id.txt_viewreport_suspectweapon);
@@ -245,6 +247,7 @@ public class ViewReportActivity extends BaseActivity {
scorelabel.setText(Integer.toString(incident.getVotedScore()));
txtIncidentCategory.setText(incident.getIncidentCategoryName(tmpContext));
txtIncidentSubCategory.setText(incident.getIncidentSubCategoryName(tmpContext));
+ txtTime.setText(incident.getTimeString(tmpContext));
txtSuspect.setText(incident.getSuspectString(tmpContext));
txtWeapons.setText(incident.getSuspectWeaponsString(tmpContext));
txtNumOfSuspects.setText(incident.getSuspectNoOfString(tmpContext));
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 ae77e9e..15322af 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
@@ -267,6 +267,8 @@ public class IncidentReport implements ClusterItem {
case 1:
if((this.fromDate != null) && !(this.fromDate.equals("0000-00-00"))){
returnString = this.fromDate+" "+this.fromTime.substring(0,5);
+ }else if(this.fromDate.equals("0000-00-00")){
+ returnString = this.createdAt.substring(0,16);
}else{
returnString = context.getResources().getStringArray(R.array.cat_time_main)[this.fidTimeCategory-1];
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7908182..588009e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -143,6 +143,7 @@
Wie erkennt man die Täter?
Weiteres?
Weitere Details...
+
Bitte wähle zunächst einen Ort auf der Karte aus
Time
Suspect