diff --git a/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java b/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java index b1036b9..88359d7 100644 --- a/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java @@ -304,7 +304,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr } else { String errorMsg = jObj.getString("error_msg"); Log.e(TAG, "Error at social media login (Server returned error): " + errorMsg); - Toast.makeText(getApplicationContext(),errorMsg, Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), getResources().getString(R.string.txt_errormsg_sociallogin), Toast.LENGTH_LONG).show(); } } catch (JSONException e) { e.printStackTrace(); @@ -316,15 +316,13 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr @Override public void onErrorResponse(VolleyError error) { Log.e(TAG, "Social Media Login Error: " + error.getMessage()); - Toast.makeText(getApplicationContext(), - error.getMessage(), Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), getResources().getString(R.string.txt_errormsg_sociallogin), Toast.LENGTH_LONG).show(); hideDialog(); } }) { @Override protected Map getParams() { - // Posting params to register url Map params = new HashMap<>(); params.put("tag", AppConfig.REST_LOGIN_SOCIAL); params.put("key", key); @@ -413,7 +411,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr } else { String errorMsg = jObj.getString("error_msg"); Log.e(TAG, "Error at login (Server returned error): " + errorMsg); - Toast.makeText(getApplicationContext(), errorMsg, Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), getResources().getString(R.string.txt_errormsg_login), Toast.LENGTH_LONG).show(); } } catch (JSONException e) { e.printStackTrace(); @@ -424,7 +422,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr @Override public void onErrorResponse(VolleyError error) { Log.e(TAG, "Login Error: " + error.getMessage()); - Toast.makeText(getApplicationContext(), error.getMessage(), Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), getResources().getString(R.string.txt_errormsg_login), Toast.LENGTH_LONG).show(); hideDialog(); } }) { @@ -470,8 +468,8 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr .show(); } else { String errorMsg = jObj.getString("error_msg"); - Toast.makeText(getApplicationContext(), - errorMsg, Toast.LENGTH_LONG).show(); + Log.e(TAG, "Error occured: "+errorMsg); + Toast.makeText(getApplicationContext(), getResources().getString(R.string.txt_errormsg_register), Toast.LENGTH_LONG).show(); } } catch (JSONException e) { e.printStackTrace(); @@ -483,7 +481,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr public void onErrorResponse(VolleyError error) { Log.e(TAG, "Registration Error: " + error.getMessage()); Toast.makeText(getApplicationContext(), - error.getMessage(), Toast.LENGTH_LONG).show(); + getResources().getString(R.string.txt_errormsg_register), Toast.LENGTH_LONG).show(); hideDialog(); } }) { @@ -516,8 +514,9 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr showMessage(getString(R.string.alert_passwordreset_confirmation)); } else { String errorMsg = jObj.getString("error_msg"); + Log.e(TAG, "Reset PW returned error value: "+errorMsg); Toast.makeText(getApplicationContext(), - errorMsg, Toast.LENGTH_LONG).show(); + getResources().getString(R.string.txt_errormsg_getpwreset), Toast.LENGTH_LONG).show(); } } catch (JSONException e) { e.printStackTrace(); @@ -530,7 +529,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr public void onErrorResponse(VolleyError error) { Log.e(TAG, "E-Mail pw resend Error: " + error.getMessage()); Toast.makeText(getApplicationContext(), - error.getMessage(), Toast.LENGTH_LONG).show(); + getResources().getString(R.string.txt_errormsg_getpwreset), Toast.LENGTH_LONG).show(); hideDialog(); } }) { @@ -559,8 +558,9 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr boolean error = jObj.getBoolean("error"); if (error) { String errorMsg = jObj.getString("error_msg"); + Log.e(TAG,"Resend E-Mail returned error value: "+errorMsg); Toast.makeText(getApplicationContext(), - errorMsg, Toast.LENGTH_LONG).show(); + getResources().getString(R.string.txt_errormsg_getactivationlink), Toast.LENGTH_LONG).show(); } } catch (JSONException e) { e.printStackTrace(); @@ -573,7 +573,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr public void onErrorResponse(VolleyError error) { Log.e(TAG, "E-Mail pw resend Error: " + error.getMessage()); Toast.makeText(getApplicationContext(), - error.getMessage(), Toast.LENGTH_LONG).show(); + getResources().getString(R.string.txt_errormsg_getactivationlink), Toast.LENGTH_LONG).show(); hideDialog(); } }) { 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 2de71b1..4dde5f0 100644 --- a/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java @@ -354,7 +354,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa @Override protected Map getParams() { Map params = new HashMap<>(); - params.put("tag", "getincidentsforheatmapfrombound"); + params.put("tag", AppConfig.REST_GET_INCIDENTS_FROMBOUND_FORHEATMAP); params.put("uid", user.get(SessionManager.KEY_UID)); params.put("token", user.get(SessionManager.TOKEN)); params.put("nelat", Double.toString(northeast.latitude)); @@ -401,7 +401,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa @Override protected Map getParams() { Map params = new HashMap<>(); - params.put("tag", "getincidentsfrombound"); + params.put("tag", AppConfig.REST_GET_INCIDENTS_FROMBOUND); params.put("uid", user.get(SessionManager.KEY_UID)); params.put("token", user.get(SessionManager.TOKEN)); params.put("nelat", Double.toString(northeast.latitude)); @@ -474,7 +474,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); - showMessage(errorMsg); + showMessage(getResources().getString(R.string.txt_errormsg_getinfowindow)); } } catch (JSONException e) { e.printStackTrace(); 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 474ff23..226367e 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java @@ -240,8 +240,8 @@ public class ReportWFActivity extends BaseActivity implements ReportWF_1_Fragmen if((id == R.id.menu_btn_gotostart)){ new AlertDialog.Builder(ReportWFActivity.this) - .setTitle("New Incident?") - .setMessage("Reset everything?") + .setTitle(getResources().getString(R.string.txt_reportwf_newincidenttitle)) + .setMessage(getResources().getString(R.string.txt_reportwf_newincidenttext)) .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { resetStateAndIncident(); @@ -302,7 +302,7 @@ public class ReportWFActivity extends BaseActivity implements ReportWF_1_Fragmen } else { String errorMsg = jObj.getString("error_msg"); Log.e(TAG, "Error adding incident (Server returned error): " + errorMsg); - showMessage(errorMsg); + showMessage(getResources().getString(R.string.txt_errormsg_createincident)); } } catch (JSONException e) { e.printStackTrace(); 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 ce19046..dde4a77 100644 --- a/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java @@ -245,11 +245,13 @@ public class SubscriptionsActivity extends BaseActivity{ try { JSONObject jo = new JSONObject(purchaseData); String sku = jo.getString("productId"); - showMessage("You have bought the " + sku + ". Thank you for your support!"); + String title = jo.getString("title"); + //TODO: Dont show sku but product title + showMessage(getResources().getString(R.string.txt_subs_youbought) + sku + ". "+getResources().getString(R.string.txt_subs_thankyou)); addSubscription(purchaseMap.get(sku).getString("productId"),purchaseMap.get(sku).getString("type"),purchaseMap.get(sku).getString("price_amount_micros"),purchaseMap.get(sku).getString("price_currency_code")); } catch (JSONException e) { - showMessage("Failed to parse purchase data."); + showMessage(getResources().getString(R.string.txt_errormsg_subs)); e.printStackTrace(); } } @@ -275,6 +277,7 @@ public class SubscriptionsActivity extends BaseActivity{ if (error) { String errorMsg = jObj.getString("error_msg"); Log.e(TAG, "Error adding subscription (Server returned error): " + errorMsg); + showMessage(getResources().getString(R.string.txt_errormsg_subs)); } else { getSubscriptions(user.get(SessionManager.KEY_UID)); } @@ -288,6 +291,7 @@ public class SubscriptionsActivity extends BaseActivity{ @Override public void onErrorResponse(VolleyError error) { Log.e(TAG, "Error adding subscription: " + error.getMessage()); + showMessage(getResources().getString(R.string.txt_errormsg_subs)); } }) { 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 8e79a4d..41e9b48 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java @@ -103,8 +103,8 @@ public class ViewReportActivity extends BaseActivity { @Override public void onClick(View v) { new AlertDialog.Builder(ViewReportActivity.this) - .setTitle("Delete incident") - .setMessage("Do you really want to delete this incident?") + .setTitle(getResources().getString(R.string.txt_viewreport_deletetitle)) + .setMessage(getResources().getString(R.string.txt_viewreport_deletetext)) .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { deleteReport(id); @@ -167,7 +167,7 @@ public class ViewReportActivity extends BaseActivity { } else { String errorMsg = jObj.getString("error_msg"); Log.e(TAG, "Error deleting incident (Server returned error): " + errorMsg); - showMessage(errorMsg); + showMessage(getResources().getString(R.string.txt_errormsg_deleteincident)); } } catch (JSONException e) { e.printStackTrace(); @@ -178,7 +178,7 @@ public class ViewReportActivity extends BaseActivity { @Override public void onErrorResponse(VolleyError error) { Log.e(TAG, "Error deleting incident: " + error.getMessage()); - showMessage(getString(R.string.errormsg_couldnotretrieve)); + showMessage(getResources().getString(R.string.txt_errormsg_deleteincident)); hideDialog(); } }) { @@ -187,7 +187,7 @@ public class ViewReportActivity extends BaseActivity { protected Map getParams() { // Posting parameters to login url Map params = new HashMap<>(); - params.put("tag", "deactivateincident"); + params.put("tag", AppConfig.REST_DEACTIVATE_INCIDENT); params.put("uid", user.get(SessionManager.KEY_UID)); params.put("token", user.get(SessionManager.TOKEN)); params.put("incidentid", incidentid.toString()); @@ -218,7 +218,7 @@ public class ViewReportActivity extends BaseActivity { } else { String errorMsg = jObj.getString("error_msg"); Log.e(TAG, "Error get incident (Server returned error): " + errorMsg); - showMessage(errorMsg); + showMessage(getResources().getString(R.string.txt_errormsg_getincidentdetail)); } } catch (JSONException e) { e.printStackTrace(); @@ -238,7 +238,7 @@ public class ViewReportActivity extends BaseActivity { protected Map getParams() { // Posting parameters to login url Map params = new HashMap<>(); - params.put("tag", "getincidentfromincidentid"); + params.put("tag", AppConfig.REST_GET_INCIDENTS_FROMINCIDENTID); params.put("uid", user.get(SessionManager.KEY_UID)); params.put("token", user.get(SessionManager.TOKEN)); params.put("incidentid", incidentid.toString()); @@ -333,7 +333,7 @@ public class ViewReportActivity extends BaseActivity { public void makeUpvote(Integer incidentid) { if(user.get(SessionManager.KEY_UID).equals(Integer.toString(incident.getFidFromUser()))){ - showMessage("You can not vote your own incidents"); + showMessage(getResources().getString(R.string.txt_errormsg_cannotvoteowninc)); }else { String tag_string_req = "addvote"; StringRequest strReq = getStringRequestAddVote(incidentid, "1"); @@ -343,7 +343,7 @@ public class ViewReportActivity extends BaseActivity { public void makeDownvote(Integer incidentid) { if(user.get(SessionManager.KEY_UID).equals(Integer.toString(incident.getFidFromUser()))){ - showMessage("You can not vote your own incidents"); + showMessage(getResources().getString(R.string.txt_errormsg_cannotvoteowninc)); }else { String tag_string_req = "addvote"; StringRequest strReq = getStringRequestAddVote(incidentid, "2"); @@ -372,7 +372,7 @@ public class ViewReportActivity extends BaseActivity { } else { String errorMsg = jObj.getString("error_msg"); Log.e(TAG, "Error voting incident (Server returned error): " + errorMsg); - showMessage(errorMsg); + showMessage(getResources().getString(R.string.txt_errormsg_couldnotvote)); } } catch (JSONException e) { e.printStackTrace(); @@ -391,7 +391,7 @@ public class ViewReportActivity extends BaseActivity { @Override protected Map getParams() { Map params = new HashMap<>(); - params.put("tag", "addvote"); + params.put("tag", AppConfig.REST_ADD_VOTE); params.put("uid", user.get(SessionManager.KEY_UID)); params.put("token", user.get(SessionManager.TOKEN)); params.put("incidentid", incidentid.toString()); 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 1d0a5af..219df97 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 @@ -133,6 +133,7 @@ public class ProfileStatisticsFragment extends Fragment { } else { String errorMsg = jObj.getString("error_msg"); Log.e(TAG, "Error getting user stats (server returned error): " + errorMsg); + //TODO: CONTINUE HERE WITH STRINGS parent.showMessage(errorMsg); } } catch (JSONException e) { diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7b601da..2f5790f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -148,6 +148,23 @@ Jetzt melden! Weiter Feedback senden + Could not log-in. Please try again later or contact RiskAhead support. + Sorry, could not log-in. Please try again later or contact RiskAhead support. + Sorry, could not registrate. Please try again later or contact RiskAhead support. + Sorry, could not send E-Mail. Please try again later or contact RiskAhead support. + Sorry, we could not send you an activation link. Please try again later or contact RiskAhead support. + Sorry, could not load info window values. Please try again later or contact RiskAhead support. + Create new incident? + Do you want to reset all values and create a new incident? + You have bought + Thank you for your support! + There was an error parsing your purchase data. Please try again or contact RiskAhead support. + Delete incident? + Do you really want to delete this incident? A deleted incident can not be restored. + Sorry, we could not delete this incident. Please try again later or contact RiskAhead support. + Sorry, we could not retrieve incident details. Please try again later or contact RiskAhead support. + You can not vote your own incident. + Sorry, we could not save your vote. Please try again later or contact RiskAhead support. Allgemeiner Vorfall/Situation diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 318e7bb..d34c7a5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -152,6 +152,24 @@ Report NOW! Next Send Feedback + Could not log-in. Please try again later or contact RiskAhead support. + Sorry, could not log-in. Please try again later or contact RiskAhead support. + Sorry, could not registrate. Please try again later or contact RiskAhead support. + Sorry, could not send E-Mail. Please try again later or contact RiskAhead support. + Sorry, we could not send you an activation link. Please try again later or contact RiskAhead support. + Sorry, could not load info window values. Please try again later or contact RiskAhead support. + Create new incident? + Do you want to reset all values and create a new incident? + Sorry, we could not save your incident. Please try again later or contact RiskAhead support. + You have bought + Thank you for your support! + There was an error parsing your purchase data. Please try again or contact RiskAhead support. + Delete incident? + Do you really want to delete this incident? A deleted incident can not be restored. + Sorry, we could not delete this incident. Please try again later or contact RiskAhead support. + Sorry, we could not retrieve incident details. Please try again later or contact RiskAhead support. + You can not vote your own incident. + Sorry, we could not save your vote. Please try again later or contact RiskAhead support. Allgemeiner Vorfall/Situation