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
763c0382
Commit
763c0382
authored
Nov 16, 2017
by
Nastuzzi Samy
Browse files
Merge branch 'hotfix/updatepopupwhennoconnection' into develop
parents
251438c3
7707dd41
Changes
3
Hide whitespace changes
Inline
Side-by-side
PayUTC 0.9.
0
.apk
→
PayUTC 0.9.
1
.apk
View file @
763c0382
No preview for this file type
app/src/main/AndroidManifest.xml
View file @
763c0382
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"fr.utc.simde.jessy"
android:versionCode=
"2
4
"
android:versionName=
"0.9"
>
android:versionCode=
"2
5
"
android:versionName=
"0.9
.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 @
763c0382
...
...
@@ -614,15 +614,8 @@ public abstract class BaseActivity extends InternetActivity {
}
});
}
else
if
(
popupIfNot
)
throw
new
Exception
(
getString
(
R
.
string
.
no_update
));
else
runOnUiThread
(
new
Runnable
()
{
@Override
public
void
run
()
{
dialog
.
stopLoading
();
}
});
throw
new
Exception
(
getString
(
R
.
string
.
no_update
));
}
else
throw
new
Exception
(
getString
(
R
.
string
.
can_not_detect_update
));
...
...
@@ -633,7 +626,9 @@ public abstract class BaseActivity extends InternetActivity {
@Override
public
void
run
()
{
dialog
.
stopLoading
();
dialog
.
errorDialog
(
BaseActivity
.
this
,
getString
(
R
.
string
.
update
),
e
.
getMessage
()
+
"\n"
+
getString
(
R
.
string
.
actual_version
)
+
": "
+
BuildConfig
.
VERSION_NAME
);
if
(
popupIfNot
)
dialog
.
errorDialog
(
BaseActivity
.
this
,
getString
(
R
.
string
.
update
),
e
.
getMessage
()
+
"\n"
+
getString
(
R
.
string
.
actual_version
)
+
": "
+
BuildConfig
.
VERSION_NAME
);
}
});
}
...
...
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