diff --git a/mobile/res/values/strings.xml b/mobile/res/values/strings.xml index 8699ebec..6c810a6f 100644 --- a/mobile/res/values/strings.xml +++ b/mobile/res/values/strings.xml @@ -63,7 +63,9 @@ to evoke the Layer Drawer]]> - +
+ • tap and hold a portal for a second
+ • tap on the left half of the status bar]]>
UI @@ -109,4 +111,4 @@ Base Layer Overlay Layers - \ No newline at end of file + diff --git a/mobile/src/com/cradle/iitc_mobile/async/CheckHttpResponse.java b/mobile/src/com/cradle/iitc_mobile/async/CheckHttpResponse.java index 431dee3c..057b0c74 100644 --- a/mobile/src/com/cradle/iitc_mobile/async/CheckHttpResponse.java +++ b/mobile/src/com/cradle/iitc_mobile/async/CheckHttpResponse.java @@ -43,7 +43,13 @@ public class CheckHttpResponse extends AsyncTask { int code = response.getStatusLine().getStatusCode(); if (code != HttpStatus.SC_OK) { Log.d("iitcm", "received error code: " + code); - ((IITC_Mobile) mContext).setLoadingState(false); + final IITC_Mobile iitc = (IITC_Mobile) mContext; + iitc.runOnUiThread(new Runnable() { + @Override + public void run() { + iitc.setLoadingState(false); + } + }); // TODO: remove when google login issue is fixed if (urls[0].contains("uberauth=WILL_NOT_SIGN_IN")) { return true; diff --git a/plugins/portals-list.user.js b/plugins/portals-list.user.js index 84dfa1a1..089e0966 100644 --- a/plugins/portals-list.user.js +++ b/plugins/portals-list.user.js @@ -301,6 +301,7 @@ window.plugin.portalslist.portalTable = function(sortBy, sortOrder, filter) { + 'M2' + 'M3' + 'M4' + + 'Mit.' + 'AP Gain' + 'E/AP' + 'Age'; @@ -314,6 +315,9 @@ window.plugin.portalslist.portalTable = function(sortBy, sortOrder, filter) { + '' + portal.level + '' + '' + portal.team + ''; + var mitigationDetails = getPortalMitigationDetails(portal.portal); + portal.mitigation = mitigationDetails.total + mitigationDetails.excess; + var title; var percent; $.each([0, 1, 2, 3 ,4 ,5 ,6 ,7], function(ind, slot) { @@ -333,6 +337,7 @@ window.plugin.portalslist.portalTable = function(sortBy, sortOrder, filter) { + '' + portal.mods[1][2] + '' + '' + portal.mods[2][2] + '' + '' + portal.mods[3][2] + '' + + '' + portal.mitigation + '' + '' + portal.APgain + '' + '' + portal.EAP + '' + '' + portal.age_string_short + '';