Commit a224c32c authored by Nastuzzi Samy's avatar Nastuzzi Samy
Browse files

Merge branch 'hotfix/ginger' into develop

parents 72924b8f f316755e
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="fr.utc.simde.jessy" package="fr.utc.simde.jessy"
android:versionCode="43" android:versionCode="44"
android:versionName="0.12.0"> android:versionName="0.12.1">
<uses-permission android:name="android.permission.NFC" /> <uses-permission android:name="android.permission.NFC" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
......
...@@ -627,11 +627,14 @@ public abstract class BaseActivity extends InternetActivity { ...@@ -627,11 +627,14 @@ public abstract class BaseActivity extends InternetActivity {
dialog.startLoading(BaseActivity.this, getString(R.string.key_registration), getString(R.string.ginger_registering)); dialog.startLoading(BaseActivity.this, getString(R.string.key_registration), getString(R.string.ginger_registering));
final Ginger gingerTest = new Ginger(BaseActivity.this);
gingerTest.setKey(key);
new Thread() { new Thread() {
@Override @Override
public void run() { public void run() {
try { try {
ginger.getInfo(nemopaySession.getUsername()); gingerTest.getInfo(nemopaySession.getUsername());
Thread.sleep(100); Thread.sleep(100);
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
...@@ -639,6 +642,8 @@ public abstract class BaseActivity extends InternetActivity { ...@@ -639,6 +642,8 @@ public abstract class BaseActivity extends InternetActivity {
public void run() { public void run() {
dialog.stopLoading(); dialog.stopLoading();
ginger.setKey(key);
SharedPreferences.Editor editor = sharedPreferences.edit(); SharedPreferences.Editor editor = sharedPreferences.edit();
editor.putString("key_ginger", key); editor.putString("key_ginger", key);
editor.apply(); editor.apply();
......
Markdown is supported
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