diff --git a/app/src/main/java/monnethic/mobile/homepage/LoginActivity.java b/app/src/main/java/monnethic/mobile/homepage/LoginActivity.java index e27a866..210a0a4 100644 --- a/app/src/main/java/monnethic/mobile/homepage/LoginActivity.java +++ b/app/src/main/java/monnethic/mobile/homepage/LoginActivity.java @@ -13,6 +13,9 @@ import android.widget.EditText; import android.widget.Toast; import com.example.monnthic.monnethicmobile.R; import org.json.JSONObject; + +import java.util.logging.Logger; + import monnethic.mobile.database.User; import monnethic.mobile.restApi.UserApiHandler; import monnethic.mobile.wallet.HomeWalletActivity; @@ -66,6 +69,7 @@ public class LoginActivity extends AppCompatActivity { //AsyncTask for login private class UserLoggerTask extends AsyncTask { Context mContext; + ProgressDialog progDailog = new ProgressDialog(LoginActivity.this); private UserLoggerTask(final Context context){ mContext = context; } @@ -73,7 +77,6 @@ public class LoginActivity extends AppCompatActivity { @Override protected void onPreExecute() { super.onPreExecute(); - ProgressDialog progDailog = new ProgressDialog(LoginActivity.this); progDailog.setMessage("Login..."); progDailog.setIndeterminate(false); progDailog.setProgressStyle(ProgressDialog.STYLE_SPINNER); @@ -99,9 +102,11 @@ public class LoginActivity extends AppCompatActivity { finish(); } else { Toast.makeText(mContext, "AN ERROR OCCURED", Toast.LENGTH_SHORT).show(); + progDailog.dismiss(); } }else{ Toast.makeText(mContext, "AN ERROR OCCURED", Toast.LENGTH_SHORT).show(); + progDailog.dismiss(); } }catch (Exception e){ e.printStackTrace(); diff --git a/app/src/main/java/monnethic/mobile/restApi/Config.java b/app/src/main/java/monnethic/mobile/restApi/Config.java index ceabc15..565482a 100644 --- a/app/src/main/java/monnethic/mobile/restApi/Config.java +++ b/app/src/main/java/monnethic/mobile/restApi/Config.java @@ -16,6 +16,8 @@ public class Config { static private String getBaseUrlUser(){ if(API==0){ return "http://5.39.76.139:10053/api/rest/user/"; + //return "http://10.0.2.2:10053/api/rest/user/"; + //return "http://localhost:10053/api/rest/user/"; } else { return "http://37.187.101.44:10053/api/rest/user/"; } @@ -23,6 +25,8 @@ public class Config { static private String getBaseUrlTransaction(){ if(API==0){ return "http://5.39.76.139:10053/api/rest/transaction/"; + //return "http://10.0.2.2:10053/api/rest/transaction/"; + //return "http://localhost:10053/api/rest/transaction/"; } else { return "http://37.187.101.44:10053/api/rest/transaction/"; } @@ -30,6 +34,8 @@ public class Config { static private String getBaseUrlWallet(){ if(API==0){ return "http://5.39.76.139:10053/api/rest/wallet/"; + //return "http://10.0.2.2:10053/api/rest/wallet/"; + //return "http://localhost:10053/api/rest/wallet/"; } else { return "http://37.187.101.44:10053/api/rest/wallet/"; } @@ -37,6 +43,8 @@ public class Config { static private String getBaseUrlSession(){ if(API==0){ return "http://5.39.76.139:10053/api/rest/session/"; + //return "http://10.0.2.2:10053/api/rest/session/"; + //return "http://localhost:10053/api/rest/session/"; } else { return "http://37.187.101.44:10053/api/rest/session/"; } @@ -44,6 +52,8 @@ public class Config { static private String getConfigBaseUrl(){ if(API==0){ return "http://5.39.76.139:10053/api/rest/demo/conf"; + //return "http://10.0.2.2:10053/api/rest/demo/conf"; + //return "http://localhost:10053/api/rest/demo/conf/"; } else { return "http://37.187.101.44:10053/api/rest/demo/conf"; } diff --git a/app/src/main/java/monnethic/mobile/restApi/HttpCallHandler.java b/app/src/main/java/monnethic/mobile/restApi/HttpCallHandler.java index 3aca8bb..13dbd99 100644 --- a/app/src/main/java/monnethic/mobile/restApi/HttpCallHandler.java +++ b/app/src/main/java/monnethic/mobile/restApi/HttpCallHandler.java @@ -1,12 +1,17 @@ package monnethic.mobile.restApi; import org.json.JSONObject; + +import java.io.BufferedOutputStream; import java.io.BufferedReader; +import java.io.BufferedWriter; import java.io.DataOutputStream; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.OutputStreamWriter; import java.net.HttpURLConnection; import java.net.URL; +import java.nio.charset.Charset; import java.util.Map; public class HttpCallHandler { @@ -59,7 +64,7 @@ public class HttpCallHandler { } DataOutputStream os = new DataOutputStream(urlConnection.getOutputStream()); - os.writeBytes(jsonParam.toString()); + os.write(jsonParam.toString().getBytes("UTF-8")); int statusCode = urlConnection.getResponseCode(); if(statusCode != 200){ @@ -105,7 +110,7 @@ public class HttpCallHandler { } DataOutputStream os = new DataOutputStream(urlConnection.getOutputStream()); - os.writeBytes(jsonParam.toString()); + os.write(jsonParam.toString().getBytes("UTF-8")); urlConnection.getResponseCode(); } } diff --git a/app/src/main/java/monnethic/mobile/restApi/UserApiHandler.java b/app/src/main/java/monnethic/mobile/restApi/UserApiHandler.java index fe89bcb..0e65f0d 100644 --- a/app/src/main/java/monnethic/mobile/restApi/UserApiHandler.java +++ b/app/src/main/java/monnethic/mobile/restApi/UserApiHandler.java @@ -1,5 +1,7 @@ package monnethic.mobile.restApi; +import android.util.Log; + import org.json.JSONObject; import java.net.URL; import java.util.HashMap; @@ -56,7 +58,6 @@ public class UserApiHandler { if(jsonObject.getInt("status")!=200){ return jsonObject; } else { - System.out.println("OUT OUT OUT / "+jsonObject.toString()); u.setUser_hash(jsonObject.getString("user_hash")); JSONObject jsonReturn = new JSONObject(); jsonReturn.put("status",200); diff --git a/app/src/test/java/monnethic/mobile/test/restAPI/testLogin.java b/app/src/test/java/monnethic/mobile/test/restAPI/testLogin.java new file mode 100644 index 0000000..d935511 --- /dev/null +++ b/app/src/test/java/monnethic/mobile/test/restAPI/testLogin.java @@ -0,0 +1,53 @@ +package monnethic.mobile.test.restAPI; + +import org.json.JSONObject; +import org.junit.Test; + +import monnethic.mobile.database.User; +import monnethic.mobile.restApi.UserApiHandler; + +public class testLogin { + + + /* + @Test + public void registerUser(){ + String name = "Georges"; + String firstname = "Patrick"; + String phone = "0724812479"; + String association = "gonette"; + String email = "patrick.g@mail.com"; + String password = "Gpatr014<*ù"; + + try{ + User u = new User(name,firstname,email,password,phone,association); + + UserApiHandler userApiHandler = new UserApiHandler(); + JSONObject userReturn= userApiHandler.registerUser(u); + System.out.println(userReturn.toString()); + }catch (Exception e){ + e.printStackTrace(); + } + } + + + + + @Test + public void loginUser(){ + String email = "patrick.g@mail.com"; + String password = "Gpatr014<*ù"; + + try{ + User u = new User(email,password); + + UserApiHandler userApiHandler = new UserApiHandler(); + JSONObject userReturn= userApiHandler.loginUser(u); + System.out.println(userReturn.toString()); + }catch (Exception e){ + e.printStackTrace(); + } + } + */ + +}