diff --git a/app/src/main/java/monnethic/mobile/homepage/LoginActivity.java b/app/src/main/java/monnethic/mobile/homepage/LoginActivity.java
index 4ed7c4a..af0210c 100644
--- a/app/src/main/java/monnethic/mobile/homepage/LoginActivity.java
+++ b/app/src/main/java/monnethic/mobile/homepage/LoginActivity.java
@@ -80,15 +80,14 @@ public class LoginActivity extends AppCompatActivity {
protected void onPostExecute(JSONObject result) {
try{
if(result!=null){
- if(result.getString("response").equals("Ok")){
+ if(result.getInt("status") == 200){
Intent accountIntent = new Intent(LoginActivity.this, UserAccountActivity.class);
accountIntent.putExtra("userHash", result.getString("userHash"));
LoginActivity.this.startActivity(accountIntent);
finish();
- }else {
+ }else{
Toast.makeText(mContext, result.getString("response"), Toast.LENGTH_SHORT).show();
}
-
}else{
Toast.makeText(mContext, "AN ERROR OCCURED", Toast.LENGTH_SHORT).show();
}
@@ -96,19 +95,13 @@ public class LoginActivity extends AppCompatActivity {
e.printStackTrace();
}
}
-
@Override
protected JSONObject doInBackground(String... params) {
try{
String url = Config.USER_LOGIN;
- //String email = params[0];
- //String password = params[1];
String[] paramsList = {params[0],params[1]};
-
HttpCallHandler httpCallHandler = new HttpCallHandler();
- String response = httpCallHandler.executePostHttp(url,paramsList);
-
- return new JSONObject(response);
+ return new JSONObject(httpCallHandler.executePostHttp(url,paramsList));
}catch (Exception e){
e.printStackTrace();
return null;
diff --git a/app/src/main/java/monnethic/mobile/restApi/HttpCallHandler.java b/app/src/main/java/monnethic/mobile/restApi/HttpCallHandler.java
index e1796a6..e98822c 100644
--- a/app/src/main/java/monnethic/mobile/restApi/HttpCallHandler.java
+++ b/app/src/main/java/monnethic/mobile/restApi/HttpCallHandler.java
@@ -60,64 +60,56 @@ public class HttpCallHandler {
}
public String executePostHttp(String urlParam, String[] params){
- InputStream inputStream;
BufferedReader bufferedReader = null;
- HttpURLConnection urlConnection = null;
+ HttpURLConnection connection = null;
+ String res = null;
try{
- System.out.println("CALL EXECUTE POST HTTP");
URL url = new URL(urlParam);
- HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection = (HttpURLConnection) url.openConnection();
connection.setRequestMethod("POST");
connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
connection.setRequestProperty("Accept","application/json");
connection.setDoOutput(true);
connection.setDoInput(true);
-
-
JSONObject jsonParam = new JSONObject();
jsonParam.put("email",params[0]);
jsonParam.put("password",params[1]);
-
DataOutputStream os = new DataOutputStream(connection.getOutputStream());
os.writeBytes(jsonParam.toString());
-
int statusCode = connection.getResponseCode();
-
if(statusCode != 200){
- System.out.println("Error response");
- System.out.println(statusCode);
+ JSONObject jsonReturn = new JSONObject();
+ System.out.println("Response code is : "+statusCode);
+ if(statusCode == 404){
+ jsonReturn.put("status",404);
+ jsonReturn.put("response","Not Found");
+ return jsonReturn.toString();
+ }else if(statusCode == 403){
+ jsonReturn.put("status",403);
+ jsonReturn.put("response","Wrong Password");
+ return jsonReturn.toString();
+ }
+ }else{
+ bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+ StringBuilder stringBuilder = new StringBuilder();
+ String line;
+ while ((line = bufferedReader.readLine())!=null){
+ stringBuilder.append(line);
+ }
+ JSONObject jsonSuccess = new JSONObject(stringBuilder.toString());
+ jsonSuccess.put("status",200);
+ res = jsonSuccess.toString();
+ os.flush();
+ os.close();
}
- inputStream = urlConnection.getInputStream();
- if(inputStream == null){
- System.out.println("Error inputStream");
- }
- bufferedReader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
- StringBuilder stringBuilder = new StringBuilder();
- String line;
-
- while ((line = bufferedReader.readLine())!=null){
- stringBuilder.append(line);
- }
- System.out.println("String builder response : "+stringBuilder.toString());
-
- JSONObject json = new JSONObject(stringBuilder.toString());
- System.out.println("JSON : "+json);
-
-
- os.flush();
- os.close();
- connection.disconnect();
-
- return null;
-
-
+ return res;
}catch (Exception e){
e.printStackTrace();
return null;
} finally {
- if(urlConnection != null){
- urlConnection.disconnect();
+ if(connection != null){
+ connection.disconnect();
}
if(bufferedReader != null){
try {
diff --git a/app/src/main/java/monnethic/mobile/user/UserAccountActivity.java b/app/src/main/java/monnethic/mobile/user/UserAccountActivity.java
index 7c322ce..be09e5f 100644
--- a/app/src/main/java/monnethic/mobile/user/UserAccountActivity.java
+++ b/app/src/main/java/monnethic/mobile/user/UserAccountActivity.java
@@ -32,13 +32,16 @@ public class UserAccountActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_user_account);
-
balance = findViewById(R.id.balanceView);
+ TextView userHashView = findViewById(R.id.userHash);
Button buttonPayement = findViewById(R.id.buttonPayement);
Button buttonReceive = findViewById(R.id.buttonReceive);
Button buttonSettings = findViewById(R.id.buttonSettings);
Button buttonRefresh = findViewById(R.id.buttonRefreshBalance);
+ Intent intent = getIntent();
+ String userHash = intent.getStringExtra("userHash");
+ userHashView.setText(userHash);
buttonPayement.setOnClickListener(new View.OnClickListener() {
@Override
diff --git a/app/src/main/res/layout/activity_user_account.xml b/app/src/main/res/layout/activity_user_account.xml
index fdbda05..4bd8f9b 100644
--- a/app/src/main/res/layout/activity_user_account.xml
+++ b/app/src/main/res/layout/activity_user_account.xml
@@ -36,7 +36,7 @@
android:layout_height="45dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
- android:layout_marginBottom="220dp"
+ android:layout_marginBottom="250dp"
android:text="Payement" />