Skip to content
GitLab
Commit c8779726 authored by Nastuzzi Samy's avatar Nastuzzi Samy
Browse files

Handle Pin not initialized 

Bug fix
Cleaning
parent ef7f4351
Hide whitespace changes
Inline Side-by-side
app/src/main/java/fr/utc/simde/payutc/BaseActivity.java
View file @ c8779726
package fr.utc.simde.payutc;
import android.app.Activity;
import fr.utc.simde.payutc.tools.CASConnexion;
import fr.utc.simde.payutc.tools.Dialog;
import fr.utc.simde.payutc.tools.NemopaySession;
......@@ -19,10 +21,10 @@ public abstract class BaseActivity extends NFCActivity {
casConnexion.disconnect();
}
protected void unregister() {
protected void unregister(Activity activity) {
nemopaySession.unregister();
disconnect();
dialog.errorDialog(getString(R.string.key_registration), getString(R.string.key_remove_temp));
dialog.errorDialog(activity, getString(R.string.key_registration), getString(R.string.key_remove_temp));
}
}
app/src/main/java/fr/utc/simde/payutc/FoundationListActivity.java
View file @ c8779726
......@@ -57,7 +57,7 @@ public class FoundationListActivity extends BaseActivity {
setFoundationList(foundationList);
} catch (Exception e) {
Log.e(LOG_TAG, "error: " + e.getMessage());
dialog.errorDialog(getString(R.string.information_collection), getString(R.string.foundation_error_get_list));
dialog.errorDialog(FoundationListActivity.this, getString(R.string.information_collection), getString(R.string.foundation_error_get_list));
}
}
});
......
app/src/main/java/fr/utc/simde/payutc/MainActivity.java
View file @ c8779726
......@@ -56,7 +56,7 @@ public class MainActivity extends BaseActivity {
if (!nemopaySession.isRegistered())
addKeyDialog();
else
unregister();
unregister(MainActivity.this);
return false;
}
......@@ -77,8 +77,8 @@ public class MainActivity extends BaseActivity {
}
@Override
protected void unregister() {
super.unregister();
protected void unregister(Activity activity) {
super.unregister(activity);
((TextView) findViewById(R.id.text_app_registered)).setText(R.string.app_not_registred);
}
......@@ -88,12 +88,12 @@ public class MainActivity extends BaseActivity {
edit.remove("key");
edit.apply();
unregister();
unregister(MainActivity.this);
}
protected void setKey(final String key) {
if (nemopaySession.isRegistered()) {
dialog.errorDialog(getString(R.string.nemopay_connection), getString(R.string.nemopay_already_registered));
dialog.errorDialog(MainActivity.this, getString(R.string.nemopay_connection), getString(R.string.nemopay_already_registered));
return;
}
......@@ -121,7 +121,7 @@ public class MainActivity extends BaseActivity {
((TextView) findViewById(R.id.text_app_registered)).setText(nemopaySession.getName().substring(0, nemopaySession.getName().length() - (nemopaySession.getName().matches("^.* - ([0-9]{4})([/-])([0-9]{2})\\2([0-9]{2})$") ? 13 : 0)));
}
else
dialog.errorDialog(getString(R.string.nemopay_connection), getString(R.string.nemopay_error_registering));
dialog.errorDialog(MainActivity.this, getString(R.string.nemopay_connection), getString(R.string.nemopay_error_registering));
}
});
}
......@@ -156,7 +156,7 @@ public class MainActivity extends BaseActivity {
public void run() {
if (casConnexion.getUrl().equals("")) {
dialog.stopLoading();
dialog.errorDialog(getString(R.string.cas_connection), getString(R.string.cas_error_url));
dialog.errorDialog(MainActivity.this, getString(R.string.cas_connection), getString(R.string.cas_error_url));
}
else
dialog.changeLoading(getString(R.string.cas_in_connection));
......@@ -180,7 +180,7 @@ public class MainActivity extends BaseActivity {
dialog.changeLoading(getString(R.string.cas_in_service_adding));
else {
dialog.stopLoading();
dialog.errorDialog(getString(R.string.cas_connection), getString(R.string.cas_error_connection));
dialog.errorDialog(MainActivity.this, getString(R.string.cas_connection), getString(R.string.cas_error_connection));
}
}
});
......@@ -202,7 +202,7 @@ public class MainActivity extends BaseActivity {
dialog.changeLoading(getString(R.string.nemopay_connection));
else {
dialog.stopLoading();
dialog.errorDialog(getString(R.string.cas_connection), getString(R.string.cas_error_service_adding));
dialog.errorDialog(MainActivity.this, getString(R.string.cas_connection), getString(R.string.cas_error_service_adding));
}
}
});
......@@ -223,7 +223,7 @@ public class MainActivity extends BaseActivity {
dialog.stopLoading();
if (!nemopaySession.isConnected())
dialog.errorDialog(getString(R.string.cas_connection), getString(R.string.cas_error_service_linking));
dialog.errorDialog(MainActivity.this, getString(R.string.cas_connection), getString(R.string.cas_error_service_linking));
else if (!nemopaySession.isRegistered())
keyDialog();
else
......@@ -258,9 +258,9 @@ public class MainActivity extends BaseActivity {
if (nemopaySession.isConnected())
startFoundationListActivity();
else if (nemopaySession.getRequest().getResponseCode() == 400)
dialog.errorDialog(getString(R.string.badge_dialog), getString(R.string.badge_pin_error_not_recognized));
dialog.errorDialog(MainActivity.this, getString(R.string.badge_dialog), getString(R.string.badge_pin_error_not_recognized));
else
dialog.errorDialog(getString(R.string.badge_dialog), getString(R.string.badge_error_no_rights) + ".\n" + nemopaySession.needRights(MainActivity.this));
dialog.errorDialog(MainActivity.this, getString(R.string.badge_dialog), getString(R.string.badge_error_no_rights) + ".\n" + nemopaySession.needRights(MainActivity.this));
} catch (Exception e) {
Log.e(LOG_TAG, "error: " + e.getMessage());
}
......@@ -272,12 +272,12 @@ public class MainActivity extends BaseActivity {
protected void badgeDialog(final String idBadge) {
if (!nemopaySession.isRegistered()) {
dialog.errorDialog(getString(R.string.badge_connection), getString(R.string.badge_app_not_registered));
dialog.errorDialog(MainActivity.this, getString(R.string.badge_connection), getString(R.string.badge_app_not_registered));
return;
}
if (nemopaySession.isConnected()) {
dialog.errorDialog(getString(R.string.badge_connection), getString(R.string.already_connected) + " " + nemopaySession.getUsername());
dialog.errorDialog(MainActivity.this, getString(R.string.badge_connection), getString(R.string.already_connected) + " " + nemopaySession.getUsername());
return;
}
......@@ -309,7 +309,7 @@ public class MainActivity extends BaseActivity {
@Override
public void onClick(View view) {
dialog.dismiss();
connectWithBadge(idBadge, "0000");
dialog.errorDialog(MainActivity.this, getResources().getString(R.string.badge_connection), getResources().getString(R.string.badge_pin_not_initialized));
}
});
......@@ -318,7 +318,7 @@ public class MainActivity extends BaseActivity {
protected void casDialog() {
if (nemopaySession.isConnected()) {
dialog.errorDialog(getString(R.string.cas_connection), getString(R.string.already_connected) + " " + nemopaySession.getUsername());
dialog.errorDialog(MainActivity.this, getString(R.string.cas_connection), getString(R.string.already_connected) + " " + nemopaySession.getUsername());
return;
}
......@@ -403,7 +403,7 @@ public class MainActivity extends BaseActivity {
loading.dismiss();
if (nemopaySession.getKey().isEmpty())
dialog.errorDialog(getString(R.string.nemopay_connection), getString(R.string.nemopay_error_registering));
dialog.errorDialog(MainActivity.this, getString(R.string.nemopay_connection), getString(R.string.nemopay_error_registering));
else
setKey(nemopaySession.getKey());
}
......
app/src/main/java/fr/utc/simde/payutc/tools/Dialog.java
View file @ c8779726
......@@ -4,8 +4,10 @@ import android.app.Activity;
import android.app.ProgressDialog;
import android.content.Context;
import android.support.v7.app.AlertDialog;
import android.text.method.LinkMovementMethod;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import android.widget.TextView;
import fr.utc.simde.payutc.R;
......@@ -72,13 +74,13 @@ public class Dialog {
}
}
public void errorDialog(final String title, final String message) {
this.alertDialogBuilder = new AlertDialog.Builder(this.activity);
public void errorDialog(final Activity activity, final String title, final String message) {
this.alertDialogBuilder = new AlertDialog.Builder(activity);
this.alertDialogBuilder
.setTitle(title)
.setMessage(message)
.setCancelable(true)
.setNegativeButton(R.string.ok, null);
.setTitle(title)
.setMessage(message)
.setCancelable(true)
.setNegativeButton(R.string.ok, null);
createDialog();
}
......
app/src/main/res/values/strings.xml
View file @ c8779726
......@@ -35,11 +35,12 @@
<string name="cas_error_service_adding">Une erreur a été détectée lors de l\'ajout du service</string>
<string name="cas_error_service_connection">Erreur lors de la connexion au service depuis le CAS</string>
<string name="cas_error_service_linking">Erreur lors de la connexion entre le CAS et le service</string>
<string name="badge_connection">Connexion via badge</string>
<string name="badge_connection">Connexion par badge</string>
<string name="badge_app_not_registered">Il est nécessaire que l\'application soit enregistrée pour permettre la connexion via badge</string>
<string name="badge_recognization">Authentification du badge...</string>
<string name="badge_error_no_rights">Impossible de vérifier le badge</string>
<string name="badge_pin_error_not_recognized">Badge ou code PIN non reconnu</string>
<string name="badge_pin_not_initialized">Pour pouvoir se connecter via son badge, il est impératif d\'avoir configuré son code PIN sur https://pay.utc.fr/</string>
<string name="nemopay_connection">Connexion à Nemopay</string>
<string name="nemopay_authentification">Authentification de l\'application</string>
<string name="nemopay_registering">Enregistrement de l\'application</string>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment