Finnalisation

Add json response checker
Handle http errors
Change connectDialog to casDialog (for better understanding)

app/src/main/java/fr/utc/simde/payutc/MainActivity.java

@@ -14,14 +14,10 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.json.JSONException;
-
-import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
-import fr.utc.simde.payutc.tools.HTTPRequest;
 import fr.utc.simde.payutc.tools.NFCActivity;
 import fr.utc.simde.payutc.tools.CASConnexion;
 import fr.utc.simde.payutc.tools.Dialog;
@@ -73,7 +69,7 @@ public class MainActivity extends NFCActivity {
         usernameButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                connectDialog();
+                casDialog();
             }
         });
     }
@@ -265,7 +261,7 @@ public class MainActivity extends NFCActivity {
         }
 
         if (nemopaySession.isConnected()) {
-            dialog.errorDialog(getResources().getString(R.string.badge_connection), getResources().getString(R.string.already_connected));
+            dialog.errorDialog(getResources().getString(R.string.badge_connection), getResources().getString(R.string.already_connected) + " " + nemopaySession.getUsername());
             return;
         }
 
@@ -300,9 +296,9 @@ public class MainActivity extends NFCActivity {
         dialog.createDialog(alertDialogBuilder, pinInput);
     }
 
-    protected void connectDialog() {
+    protected void casDialog() {
         if (nemopaySession.isConnected()) {
-            dialog.errorDialog(getResources().getString(R.string.cas_connection), getResources().getString(R.string.already_connected));
+            dialog.errorDialog(getResources().getString(R.string.cas_connection), getResources().getString(R.string.already_connected) + " " + nemopaySession.getUsername());
             return;
         }
 
@@ -325,7 +321,7 @@ public class MainActivity extends NFCActivity {
 
                         Toast.makeText(MainActivity.this, R.string.username_and_password_required, Toast.LENGTH_SHORT).show();
                         dialogInterface.cancel();
-                        connectDialog();
+                        casDialog();
                     }
                     else {
                         try {

app/src/main/java/fr/utc/simde/payutc/tools/HTTPRequest.java

@@ -78,8 +78,13 @@ public class HTTPRequest {
             Log.d(LOG_TAG, "code: " + Integer.toString(this.request.getResponseCode()) + ", response: " + this.getResponse());
         }
         catch (Exception e) {
+            try {
+                Log.d(LOG_TAG, "code: " + Integer.toString(this.request.getResponseCode()) + ", error: " + e.getMessage());
+            }
+            catch (Exception e2) {
                 Log.e(LOG_TAG, e.getMessage());
             }
+        }
 
         return getResponseCode();
     }
@@ -115,8 +120,13 @@ public class HTTPRequest {
             Log.d(LOG_TAG, "code: " + Integer.toString(this.request.getResponseCode()) + ", response: " + this.getResponse());
         }
         catch (Exception e) {
+            try {
+                Log.d(LOG_TAG, "code: " + Integer.toString(this.request.getResponseCode()) + ", error: " + e.getMessage());
+            }
+            catch (Exception e2) {
                 Log.e(LOG_TAG, e.getMessage());
             }
+        }
 
         return getResponseCode();
     }
@@ -179,6 +189,17 @@ public class HTTPRequest {
     public Map<String, String> getJsonResponse() throws IOException, JSONException { return jsonToMap(response); }
     public String getResponse() throws IOException { return response; }
 
+    public Boolean isJsonResponse() {
+        try {
+            jsonToMap(response);
+        }
+        catch (Exception e) {
+            return false;
+        }
+
+        return true;
+    }
+
     protected String args2String(Map<String, String> args) throws UnsupportedEncodingException { return args2String(args, false); }
     protected String args2String(Map<String, String> args, Boolean isGet) throws UnsupportedEncodingException {
         String data = "";

app/src/main/java/fr/utc/simde/payutc/tools/NemopaySession.java

@@ -64,6 +64,7 @@ public class NemopaySession {
 
     public String getName() { return this.name; }
     public String getKey() { return this.key; }
+    public String getUsername() { return username; }
     public HTTPRequest getRequest() { return this.request; }
 
     public void getCasUrl() throws IOException {
@@ -77,7 +78,7 @@ public class NemopaySession {
             put("app_desc", description);
         }});
 
-        if (request.getResponseCode() == 200)
+        if (request.getResponseCode() == 200 && request.isJsonResponse())
             this.key = request.getJsonResponse().get("app_key");
 
         this.request = request;
@@ -88,7 +89,11 @@ public class NemopaySession {
             put("key", key);
         }});
 
-        Map<String, String> response = request.getJsonResponse();
+        Map<String, String> response;
+        if (request.getResponseCode() == 200 && request.isJsonResponse())
+            response = request.getJsonResponse();
+        else
+            throw new Exception("Not authentified");
 
         if (response.containsKey("sessionid") && response.containsKey("name")) {
             this.session = response.get("sessionid");
@@ -96,7 +101,7 @@ public class NemopaySession {
             this.key = key;
         }
         else
-            throw new Exception("Not authentified");
+            throw new Exception("No correct informations");
     }
 
     public void loginBadge(final String idBadge, final String pin) throws Exception {
@@ -105,15 +110,18 @@ public class NemopaySession {
             put("pin", pin);
         }});
 
-        Map<String, String> response = request.getJsonResponse();
+        Map<String, String> response;
+        if (request.getResponseCode() == 200 && request.isJsonResponse())
+            response = request.getJsonResponse();
+        else
+            throw new Exception("Not connected");
 
         if (response.containsKey("sessionid") && response.containsKey("username")) {
             this.session = response.get("sessionid");
             this.username = response.get("username");
         }
-        else {
-            throw new Exception("Not connected");
-        }
+        else
+            throw new Exception("No correct informations");
     }
 
     public void loginCas(final String ticket, final String service) throws Exception {
@@ -122,14 +130,18 @@ public class NemopaySession {
             put("service", service);
         }});
 
-        Map<String, String> response = request.getJsonResponse();
+        Map<String, String> response;
+        if (request.getResponseCode() == 200 && request.isJsonResponse())
+            response = request.getJsonResponse();
+        else
+            throw new Exception("Not connected");
 
         if (response.containsKey("sessionid") && response.containsKey("username")) {
             this.session = response.get("sessionid");
             this.username = response.get("username");
         }
         else
-            throw new Exception("Not connected");
+            throw new Exception("No correct informations");
     }
 
     protected void request(final String method, final String service) throws IOException { request(method, service, new HashMap<String, String>()); }

app/src/main/res/values/strings.xml

@@ -51,5 +51,5 @@
     <string name="key_name_required">Nom requis !</string>
     <string name="key_add_explication">Il est possible d\'ajouter directement une clé d\'application si celle-ci est connue</string>
     <string name="key_remove_temp">L\'application a été désauthentifiée temporairement. Il suffit de relancer l\'application pour qu\'elle soit de nouveau connectée</string>
-    <string name="already_connected">Déjà connecté !</string>
+    <string name="already_connected">Déjà connecté sous</string>
 </resources>