Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
hds
flexin
android-app
Commits
a224c32c
Commit
a224c32c
authored
Feb 19, 2018
by
Nastuzzi Samy
Browse files
Merge branch 'hotfix/ginger' into develop
parents
72924b8f
f316755e
Changes
3
Hide whitespace changes
Inline
Side-by-side
PayUTC 0.12.
0
.apk
→
PayUTC 0.12.
1
.apk
View file @
a224c32c
No preview for this file type
app/src/main/AndroidManifest.xml
View file @
a224c32c
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"fr.utc.simde.jessy"
android:versionCode=
"4
3
"
android:versionName=
"0.12.
0
"
>
android:versionCode=
"4
4
"
android:versionName=
"0.12.
1
"
>
<uses-permission
android:name=
"android.permission.NFC"
/>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
...
...
app/src/main/java/fr/utc/simde/jessy/BaseActivity.java
View file @
a224c32c
...
...
@@ -627,11 +627,14 @@ public abstract class BaseActivity extends InternetActivity {
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
()
{
@Override
public
void
run
()
{
try
{
ginger
.
getInfo
(
nemopaySession
.
getUsername
());
ginger
Test
.
getInfo
(
nemopaySession
.
getUsername
());
Thread
.
sleep
(
100
);
runOnUiThread
(
new
Runnable
()
{
...
...
@@ -639,6 +642,8 @@ public abstract class BaseActivity extends InternetActivity {
public
void
run
()
{
dialog
.
stopLoading
();
ginger
.
setKey
(
key
);
SharedPreferences
.
Editor
editor
=
sharedPreferences
.
edit
();
editor
.
putString
(
"key_ginger"
,
key
);
editor
.
apply
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment