Issue #491 - modify tangle and user controllers and front end error m…

…essages

Entangle/entangle-android/src/com/megasoft/entangle/Claim.java

@@ -74,7 +74,7 @@ public void sendClaimForm(View view) {
 		mssgBody = ((EditText) findViewById(R.id.mssgText)).getText()
 				.toString();
 		if (mssgBody.equals("")) {
-			Toast.makeText(this, "Msssg body missing", Toast.LENGTH_LONG)
+			Toast.makeText(this, "Message body missing", Toast.LENGTH_LONG)
 					.show();
 		} else {
 
@@ -102,7 +102,7 @@ protected void onPostExecute(String response) {
 							intent.addFlags(intent.FLAG_ACTIVITY_CLEAR_TOP);
 							startActivity(intent);
 						} else {
-							Toast.makeText(getBaseContext(), "Something went wrong",
+							Toast.makeText(getBaseContext(), this.getErrorMessage(),
 									Toast.LENGTH_SHORT).show();
 						}
 

Entangle/entangle-android/src/com/megasoft/entangle/CreateOfferActivity.java

@@ -189,7 +189,7 @@ protected void onPostExecute(String response) {
 						} else {
 
 							Toast.makeText(getApplicationContext(),
-									"Error, Can not create offer",
+									this.getErrorMessage(),
 									Toast.LENGTH_SHORT).show();
 						}
 					}

Entangle/entangle-android/src/com/megasoft/entangle/CreateRequestActivity.java

@@ -201,7 +201,7 @@ protected void onPostExecute(String response) {
 							finish();
 						} else {
 							Toast.makeText(getApplicationContext(),
-									"Error, Can not create request",
+									this.getErrorMessage(),
 									Toast.LENGTH_SHORT).show();
 						}
 					}

Entangle/entangle-android/src/com/megasoft/entangle/CreateTangleActivity.java

@@ -180,7 +180,7 @@ protected void onPostExecute(String response) {
 				} else {
 					if (!(this.getStatusCode() == 201)) {
 						Toast.makeText(getApplicationContext(),
-								"Try Again Later"+this.getStatusCode(), Toast.LENGTH_LONG).show();
+								this.getErrorMessage(), Toast.LENGTH_LONG).show();
 					} else {
 						goToHomePage();
 					}

Entangle/entangle-android/src/com/megasoft/entangle/DeleteButtonFragment.java

@@ -90,7 +90,7 @@ else if(getResourceType().equals(Config.OFFER_TYPE)){
 
 				DeleteRequest deleteRequest = new DeleteRequest(url){
 					protected void onPostExecute(String res) {
-						String message = "Sorry, there are problems in the delete process. Please, try again later";
+						String message = this.getErrorMessage();
 
 						if (!this.hasError() && res != null) {
 							message = "Deleted!";

Entangle/entangle-android/src/com/megasoft/entangle/MemberListFragment.java

@@ -177,10 +177,10 @@ public void onPostExecute(String response) {
 
 				if (!this.hasError() && this.getStatusCode() == 200) {
 					if (!showData(response)) {
-						toasterShow("Something went wrong, please try again later");
+						toasterShow(this.getErrorMessage());
 					}
 				} else {
-					toasterShow("Something went wrong, please try again later");
+					toasterShow(this.getErrorMessage());
 				}
 			}
 		};

Entangle/entangle-android/src/com/megasoft/entangle/OfferActivity.java

@@ -432,7 +432,7 @@ protected void onPostExecute(String response) {
 						}
 					} else {
 						Toast toast = Toast.makeText(getApplicationContext(),
-								getString(R.string.toastError),
+								this.getErrorMessage(),
 								Toast.LENGTH_SHORT);
 						toast.show();
 					}
@@ -467,6 +467,8 @@ public void onClick(View v) {
 						+ ACCEPT) {
 					protected void onPostExecute(String response) {
 						status = this.getStatusCode();
+						String responseMessage = this.getErrorMessage();
+
 						String errorMessage = this.getErrorMessage();
 						if (status == 201) {
 							acceptOffer.setVisibility(View.INVISIBLE);
@@ -479,13 +481,13 @@ protected void onPostExecute(String response) {
 							if (status == 405) {
 								Toast toast = Toast
 										.makeText(
-												getApplicationContext(),errorMessage,
+												getApplicationContext(),this.getErrorMessage(),
 												Toast.LENGTH_SHORT);
 								toast.show();
 							} else {
 								Toast toast = Toast.makeText(
 										getApplicationContext(),
-										getString(R.string.toastError),
+										this.getErrorMessage(),
 										Toast.LENGTH_SHORT);
 								toast.show();
 							}
@@ -555,14 +557,14 @@ public void markAsDone(int Offerid) {
 			protected void onPostExecute(String response) {
 				if (this.getStatusCode() == 201) {
 					Toast success = Toast.makeText(getApplicationContext(),
-							R.string.mark, Toast.LENGTH_LONG);
+							this.getErrorMessage(), Toast.LENGTH_LONG);
 					success.show();
 					markOfferAsDone.setEnabled(false);
 					markOfferAsDone.setVisibility(View.INVISIBLE);
 					offerStatus.setText("Done");
 				} else {
 					Toast error = Toast.makeText(getApplicationContext(),
-							R.string.error, Toast.LENGTH_LONG);
+							this.getErrorMessage(), Toast.LENGTH_LONG);
 					error.show();
 				}
 			}

Entangle/entangle-android/src/com/megasoft/entangle/ProfileFragment.java

@@ -131,7 +131,7 @@ protected void onPostExecute(String response) {
 						}
 				} else {
 					Log.e("test", this.getErrorMessage());
-					Toast toast = Toast.makeText(activity.getApplicationContext(),"Some error happened.",Toast.LENGTH_SHORT);
+					Toast toast = Toast.makeText(activity.getApplicationContext(),this.getErrorMessage(),Toast.LENGTH_SHORT);
 					toast.show();
 					}
 				}

Entangle/entangle-android/src/com/megasoft/entangle/RegisterActivity.java

@@ -94,13 +94,13 @@ protected void onPostExecute(String response) {
 							goToLogin(response);
 						} else if(this.getStatusCode() == 401){
 							Toast.makeText(getApplicationContext(),
-									"Not unique username",
+									this.getErrorMessage(),
 									Toast.LENGTH_SHORT).show();
 						}
 
 						else if(this.getStatusCode() == 402){
 							Toast.makeText(getApplicationContext(),
-									"Not unique email",
+									this.getErrorMessage(),
 									Toast.LENGTH_SHORT).show();
 						}
 

Entangle/entangle-android/src/com/megasoft/entangle/Request.java

@@ -65,7 +65,7 @@ protected void onPostExecute(String response) {
 						Toast.makeText(getBaseContext(), "Loading Claim Form", Toast.LENGTH_SHORT).show();
 						startActivity(intent);
 					} else {
-						Toast.makeText(getBaseContext(), "Something went wrong", Toast.LENGTH_SHORT).show();
+						Toast.makeText(getBaseContext(), this.getErrorMessage(), Toast.LENGTH_SHORT).show();
 					}
 
 				} catch (JSONException e) {

Entangle/entangle-symfony/public/src/entangle/src/Megasoft/EntangleBundle/Controller/TangleController.php

@@ -283,7 +283,7 @@ public function inviteAction(Request $request, $tangleId) {
         if (!$this->validateTangleId($tangleId)) {
             return new Response("Tangle Not Found", 404);
         }
-d
+
         $userTangleRepo = $this->getDoctrine()->getRepository('MegasoftEntangleBundle:UserTangle');
 
         if (($userTangle = $userTangleRepo->findOneBy(array('userId' => $session->getUserId(), 'tangleId' => $tangleId))) == null) {

Entangle/entangle-symfony/public/src/entangle/src/Megasoft/EntangleBundle/Controller/UserController.php

@@ -335,7 +335,7 @@ public function logoutAction(\Symfony\Component\HttpFoundation\Request $request)
         $sessionRepo = $this->getDoctrine()->getRepository('MegasoftEntangleBundle:Session');
         $session = $sessionRepo->findOneBy(array('sessionId' => $sessionId));
         if (!$session) {
-            return new JsonResponse("Please login again" 404);
+            return new JsonResponse("Please login again",404);
         }
         if ($session->getExpired()) {
             return new JsonResponse("Please login again", 400);