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

Merge branch 'release/v0.11.2'

parents 94daa207 5db2b804
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="fr.utc.simde.jessy"
android:versionCode="34"
android:versionName="0.11.1">
android:versionCode="35"
android:versionName="0.11.2">
<uses-permission android:name="android.permission.NFC" />
<uses-permission android:name="android.permission.INTERNET" />
......
......@@ -125,6 +125,18 @@ public abstract class BaseActivity extends InternetActivity {
if (!needToBeSuper) {
for (JsonNode foundation : myRightList) {
if (rightList.length == 0 && foundation.size() > 75) {
runOnUiThread(new Runnable() {
@Override
public void run() {
dialog.stopLoading();
runnable.run();
}
});
return;
}
for (JsonNode myRight : foundation) {
if (rights.contains(myRight.textValue()) && !sameRights.contains(myRight.textValue()))
sameRights.add(myRight.textValue());
......
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