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 bf532d6..74a0f9d 100644 --- a/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java @@ -41,10 +41,8 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr private final static String TAG = LoginActivity.class.getSimpleName(); private final static String EXTRA_MESSAGE = "org.deke.risk.riskahead.MESSAGE"; private final static String mActivityTitle = "RiskAhead"; + private String msg_intent; - private boolean emailIsValid = false; - private boolean fullnameIsValid = false; - private boolean passwordIsValid = false; private Button btn_login; private TextView input_email; @@ -52,7 +50,6 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr private TextView input_password; private ProgressDialog pDialog; - private SessionManager session; @Override @@ -79,9 +76,6 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr if (text.length() < 5) { textView.setError("Your username must be at least\n" + "5 characters in length."); - fullnameIsValid = false; - } else { - fullnameIsValid = true; } } }); @@ -96,9 +90,6 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr if(!Patterns.EMAIL_ADDRESS.matcher(text).matches()){ textView.setError("Please enter a valid email address\n" + "e.g.: text@abc.de"); - emailIsValid = false; - }else{ - emailIsValid = true; } } }); @@ -109,9 +100,6 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr if(text.length() < 5) { textView.setError("Your password must be at least\n" + "5 characters in length."); - passwordIsValid = false; - }else{ - passwordIsValid = true; } } }); @@ -137,7 +125,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr String password = input_password.getText().toString(); if (msg_intent.equals("login")) { - if (!emailIsValid || !passwordIsValid) { + if (input_password.getError() != null || input_email.getError() != null) { showMessage("Entered fields not valid\n" + "Please check errors first."); } else { @@ -146,7 +134,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr } } else if (msg_intent.equals("register")) { String name = input_username.getText().toString(); - if (!emailIsValid || !passwordIsValid || !fullnameIsValid) { + if (input_password.getError() != null || input_email.getError() != null || input_username.getError() != null) { showMessage("Entered fields not valid\n" + "Please check errors first."); } else { @@ -340,9 +328,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr JSONObject jObj = new JSONObject(response); boolean error = jObj.getBoolean("error"); - // Check for error node in json if (!error) { - // Now store the user in sqlite String uid = jObj.getString("uid"); JSONObject user = jObj.getJSONObject("user"); @@ -366,14 +352,12 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr StringRequest strReq = getStringRequestActivationLinkUser(input_email.getText().toString()); - // Adding request to request queue AppController.getInstance().addToRequestQueue(strReq, tag_string_req); showMessage("E-Mail was sent to your address"); } }) .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { - //do nothing } }) .setIcon(android.R.drawable.ic_dialog_alert) @@ -552,7 +536,6 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr JSONObject jObj = new JSONObject(response); boolean error = jObj.getBoolean("error"); if (error) { - // Error occurred in registration. Get the error message String errorMsg = jObj.getString("error_msg"); Toast.makeText(getApplicationContext(), errorMsg, Toast.LENGTH_LONG).show(); @@ -575,7 +558,6 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr @Override protected Map getParams() { - // Posting params to register url Map params = new HashMap<>(); params.put("tag", "resendactivationusermail"); params.put("email", email); diff --git a/app/src/main/java/org/deke/risk/riskahead/ReportActivity.java b/app/src/main/java/org/deke/risk/riskahead/ReportActivity.java index ba72d11..a073880 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ReportActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ReportActivity.java @@ -74,12 +74,8 @@ public class ReportActivity extends BaseActivity { super.onCreate(savedInstanceState); userHasToBeLoggedIn(); - - // ArrayAdapter adapter = ArrayAdapter.createFromResource(this, incidentCategories, android.R.layout.simple_spinner_item); - // adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); getCategories(); - final Calendar c = Calendar.getInstance(); year = c.get(Calendar.YEAR); month = c.get(Calendar.MONTH); @@ -188,7 +184,6 @@ public class ReportActivity extends BaseActivity { @Override public void onResponse(String response) { Log.d(TAG, "Report response: " + response); - hideDialog(); try { JSONObject jObj = new JSONObject(response); @@ -201,14 +196,12 @@ public class ReportActivity extends BaseActivity { editor.apply(); gotoMapActivity(); } else { - // Error in login. Get the error message String errorMsg = jObj.getString("error_msg"); Toast.makeText(getApplicationContext(), errorMsg, Toast.LENGTH_LONG).show(); } } catch (JSONException e) { e.printStackTrace(); } - } }, new Response.ErrorListener() { @@ -302,7 +295,7 @@ public class ReportActivity extends BaseActivity { @Override protected void onStop() { - super.onStop(); // Always call the superclass method first + super.onStop(); SharedPreferences.Editor editor = getPreferences(MODE_PRIVATE).edit(); editor.putString(SAVED_TITLE, txtTitle.getText().toString()); @@ -328,13 +321,11 @@ public class ReportActivity extends BaseActivity { @Override public void onResponse(String response) { Log.d(TAG, "Incident categories response: " + response); - hideDialog(); try { JSONObject jObj = new JSONObject(response); boolean error = jObj.getBoolean("error"); - // Check for error node in json if (!error) { JSONArray jsoncategories = jObj.getJSONArray("msg"); categories = new HashMap<>(); @@ -355,12 +346,10 @@ public class ReportActivity extends BaseActivity { spinner.setAdapter(adapter); } else { - // Error in login. Get the error message String errorMsg = jObj.getString("error_msg"); Toast.makeText(getApplicationContext(), errorMsg, Toast.LENGTH_LONG).show(); } } catch (JSONException e) { - // JSON error e.printStackTrace(); } @@ -372,22 +361,18 @@ public class ReportActivity extends BaseActivity { Log.e(TAG, "Report Error: " + error.getMessage()); Toast.makeText(getApplicationContext(), error.getMessage(), Toast.LENGTH_LONG).show(); - hideDialog(); } }) { @Override protected Map getParams() { - // Posting parameters to login url Map params = new HashMap<>(); params.put("tag", "getincidentcategories"); params.put("uid", user.get("uid")); params.put("token", user.get("token")); - return params; } - }; } } 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 601de90..5a029b6 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java @@ -54,6 +54,8 @@ public class ViewReportActivity extends BaseActivity { Intent intent = getIntent(); final String uid = intent.getStringExtra(BaseActivity.EXTRA_MESSAGE); + + txtTitle = (EditText) findViewById(R.id.input_viewreport_short); txtDescription = (EditText) findViewById(R.id.input_viewreport_long); txtCrimeCategory = (EditText) findViewById(R.id.input_viewreport_category); @@ -181,6 +183,7 @@ public class ViewReportActivity extends BaseActivity { private StringRequest getStringRequestGetIncidentWithPositionFromID(final String incidentid) { + return new StringRequest(Request.Method.POST, AppConfig.URL_REGISTER, new Response.Listener() { @Override @@ -221,10 +224,16 @@ public class ViewReportActivity extends BaseActivity { findViewById(R.id.btn_viewreport_position).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - gotoMapActivity(latitude+":"+longitude); + gotoMapActivity(latitude + ":" + longitude); } }); + if(!incident.getString("fid_user").equals(user.get("uid"))){ + findViewById(R.id.btn_viewreport_position).setVisibility(View.GONE); + findViewById(R.id.ll_01).setVisibility(View.GONE); + } + + } else { // Error in login. Get the error message String errorMsg = jObj.getString("error_msg"); @@ -345,14 +354,12 @@ public class ViewReportActivity extends BaseActivity { JSONObject jObj = new JSONObject(response); boolean error = jObj.getBoolean("error"); - // Check for error node in json if (!error) { showMessage("Voted! Score updated."); BootstrapLabel scorelabel = (BootstrapLabel) findViewById(R.id.txt_viewreport_points); scorelabel.setText(jObj.getString("points")); } else { - // Error in login. Get the error message String errorMsg = jObj.getString("error_msg"); Toast.makeText(getApplicationContext(), errorMsg, Toast.LENGTH_LONG).show(); } 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 1c6916a..2a0c14a 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 @@ -44,7 +44,6 @@ public abstract class BaseActivity extends AppCompatActivity { public SessionManager session; public HashMap user; - public ProgressDialog pDialog; public void userHasToBeLoggedIn(){ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 241c2af..06669ba 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -88,17 +88,12 @@ Exit Position - {fa_search} Position + {fa_search} {fa_paint_brush} Report this position! - - Personal - Property - Political - Report List - Hello world! + Settings View Report