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

DT @04.01.2016: Bugfixes and stuff

Browse Source
This commit is contained in:
Dennis Thießen
2016-01-04 22:52:00 +01:00
parent bd5391dbf3
commit 0dc3761e64
7 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/app.iml
View File

@@ -96,6 +96,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/release" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />

4
app/build.gradle
View File

@@ -19,8 +19,8 @@ android {
applicationId "org.deke.risk.riskahead" applicationId "org.deke.risk.riskahead"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 22 targetSdkVersion 22
versionCode 1 versionCode 2
versionName "1.0" versionName "1.1"
} }
buildTypes { buildTypes {
release { release {

2
app/src/main/java/org/deke/risk/riskahead/SettingsActivity.java
View File

@@ -194,7 +194,7 @@ public class SettingsActivity extends BaseActivity {
if (!error) { if (!error) {
showMessage(jObj.getString("msg")); showMessage(jObj.getString("msg"));
JSONObject tmpuser = jObj.getJSONObject("user"); 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(); finish();
startActivity(getIntent()); startActivity(getIntent());
} else { } else {

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

@@ -34,10 +34,9 @@ public class SubscriptionsActivity extends BaseActivity implements ServiceConnec
btnPurchaseNoAds = (Button) findViewById(R.id.btn_subscription_1); btnPurchaseNoAds = (Button) findViewById(R.id.btn_subscription_1);
btnPurchaseExtraFunctions = (Button) findViewById(R.id.btn_subscription_2); btnPurchaseExtraFunctions = (Button) findViewById(R.id.btn_subscription_2);
Intent serviceIntent = //Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
new Intent("com.android.vending.billing.InAppBillingService.BIND"); // serviceIntent.setPackage("com.android.vending");
serviceIntent.setPackage("com.android.vending"); //bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
// Bundle activeSubs = mService.getPurchases(3, "org.deke.risk.riskahead", "subs", continueToken); // Bundle activeSubs = mService.getPurchases(3, "org.deke.risk.riskahead", "subs", continueToken);

3
app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java
View File

@@ -39,6 +39,7 @@ public class ViewReportActivity extends BaseActivity {
private EditText txtIncidentCategory; private EditText txtIncidentCategory;
private EditText txtIncidentSubCategory; private EditText txtIncidentSubCategory;
private EditText txtPosition; private EditText txtPosition;
private EditText txtTime;
private EditText txtSuspect; private EditText txtSuspect;
private EditText txtWeapons; private EditText txtWeapons;
private EditText txtNumOfSuspects; private EditText txtNumOfSuspects;
@@ -60,6 +61,7 @@ public class ViewReportActivity extends BaseActivity {
txtIncidentCategory = (EditText) findViewById(R.id.txt_viewreport_incidentcategory); txtIncidentCategory = (EditText) findViewById(R.id.txt_viewreport_incidentcategory);
txtIncidentSubCategory = (EditText) findViewById(R.id.txt_viewreport_incidentsubcategory); txtIncidentSubCategory = (EditText) findViewById(R.id.txt_viewreport_incidentsubcategory);
txtPosition = (EditText) findViewById(R.id.txt_viewreport_position); txtPosition = (EditText) findViewById(R.id.txt_viewreport_position);
txtTime = (EditText) findViewById(R.id.txt_viewreport_time);
scorelabel = (BootstrapLabel) findViewById(R.id.txt_viewreport_points); scorelabel = (BootstrapLabel) findViewById(R.id.txt_viewreport_points);
txtSuspect = (EditText) findViewById(R.id.txt_viewreport_suspect); txtSuspect = (EditText) findViewById(R.id.txt_viewreport_suspect);
txtWeapons = (EditText) findViewById(R.id.txt_viewreport_suspectweapon); txtWeapons = (EditText) findViewById(R.id.txt_viewreport_suspectweapon);
@@ -245,6 +247,7 @@ public class ViewReportActivity extends BaseActivity {
scorelabel.setText(Integer.toString(incident.getVotedScore())); scorelabel.setText(Integer.toString(incident.getVotedScore()));
txtIncidentCategory.setText(incident.getIncidentCategoryName(tmpContext)); txtIncidentCategory.setText(incident.getIncidentCategoryName(tmpContext));
txtIncidentSubCategory.setText(incident.getIncidentSubCategoryName(tmpContext)); txtIncidentSubCategory.setText(incident.getIncidentSubCategoryName(tmpContext));
txtTime.setText(incident.getTimeString(tmpContext));
txtSuspect.setText(incident.getSuspectString(tmpContext)); txtSuspect.setText(incident.getSuspectString(tmpContext));
txtWeapons.setText(incident.getSuspectWeaponsString(tmpContext)); txtWeapons.setText(incident.getSuspectWeaponsString(tmpContext));
txtNumOfSuspects.setText(incident.getSuspectNoOfString(tmpContext)); txtNumOfSuspects.setText(incident.getSuspectNoOfString(tmpContext));

2
app/src/main/java/org/deke/risk/riskahead/helper/IncidentReport.java
View File

@@ -267,6 +267,8 @@ public class IncidentReport implements ClusterItem {
case 1: case 1:
if((this.fromDate != null) && !(this.fromDate.equals("0000-00-00"))){ if((this.fromDate != null) && !(this.fromDate.equals("0000-00-00"))){
returnString = this.fromDate+" "+this.fromTime.substring(0,5); returnString = this.fromDate+" "+this.fromTime.substring(0,5);
}else if(this.fromDate.equals("0000-00-00")){
returnString = this.createdAt.substring(0,16);
}else{ }else{
returnString = context.getResources().getStringArray(R.array.cat_time_main)[this.fidTimeCategory-1]; returnString = context.getResources().getStringArray(R.array.cat_time_main)[this.fidTimeCategory-1];
} }

1
app/src/main/res/values/strings.xml
View File

@@ -143,6 +143,7 @@
<string name="lbl_question_etc_recon">Wie erkennt man die Täter?</string> <string name="lbl_question_etc_recon">Wie erkennt man die Täter?</string>
<string name="lbl_question_etc_etc">Weiteres?</string> <string name="lbl_question_etc_etc">Weiteres?</string>
<string name="cat_hint">Weitere Details...</string> <string name="cat_hint">Weitere Details...</string>
<string name="hint_place">Bitte wähle zunächst einen Ort auf der Karte aus</string> <string name="hint_place">Bitte wähle zunächst einen Ort auf der Karte aus</string>
<string name="lbl_viewreport_time">Time</string> <string name="lbl_viewreport_time">Time</string>
<string name="lbl_viewreport_suspect">Suspect</string> <string name="lbl_viewreport_suspect">Suspect</string>