Skip to content
GitLab
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
2ec2eda5
Commit
2ec2eda5
authored
Dec 12, 2017
by
Nastuzzi Samy
Browse files
Merge branch 'release/v0.11.3' into develop
parents
454cbad8
a39b26ae
Changes
3
Hide whitespace changes
Inline
Side-by-side
PayUTC 0.11.
2
.apk
→
PayUTC 0.11.
3
.apk
View file @
2ec2eda5
No preview for this file type
app/src/main/AndroidManifest.xml
View file @
2ec2eda5
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"fr.utc.simde.jessy"
android:versionCode=
"3
5
"
android:versionName=
"0.11.
2
"
>
android:versionCode=
"3
6
"
android:versionName=
"0.11.
3
"
>
<uses-permission
android:name=
"android.permission.NFC"
/>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
...
...
app/src/main/java/fr/utc/simde/jessy/QRCodeReaderActivity.java
View file @
2ec2eda5
...
...
@@ -474,7 +474,10 @@ public class QRCodeReaderActivity extends BaseActivity implements ZXingScannerVi
}
protected
void
checkReservation
(
final
API
api
,
final
ComedmusResponse
comedmusResponse
)
{
if
((
System
.
currentTimeMillis
()
/
1000
)
<
comedmusResponse
.
getCreatedAt
())
{
long
currentTimestamp
=
(
System
.
currentTimeMillis
()
/
1000
);
Log
.
d
(
LOG_TAG
,
"Current time: "
+
currentTimestamp
);
if
(
currentTimestamp
<
comedmusResponse
.
getCreatedAt
())
{
runOnUiThread
(
new
Runnable
()
{
@Override
public
void
run
()
{
...
...
@@ -504,7 +507,7 @@ public class QRCodeReaderActivity extends BaseActivity implements ZXingScannerVi
return
;
}
if
(
(
System
.
currentTime
Millis
()
/
1000
)
>
comedmusResponse
.
getExpiresAt
())
{
if
(
currentTime
stamp
>
comedmusResponse
.
getExpiresAt
())
{
runOnUiThread
(
new
Runnable
()
{
@Override
public
void
run
()
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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