Some crashes was fixed

munnd · Sep 24, 2013 · 23a0239 · 23a0239
1 parent 58b0468
commit 23a0239
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/bin/main.py b/bin/main.py
@@ -92,7 +92,13 @@ def main():
     edit.add_invoke_entry('MenuShowBtn_onClick')
     edit.add_line(' move-result-object %s' % edit.vars[0])
     edit.save()
-
+
+    edit = edit_cls('AvatarPlayerStatusBar_AvatarListener')
+    edit.prepare_after_prologue('clicked')
+    edit.add_invoke_entry('Mod_ShowAgentTab', '', 'v0')
+    edit.add_ret_if_result(False)
+    edit.save()
+
     edit = edit_cls('AssetFinder')
     edit.find_line(r' const-string/jumbo v\d+, "\{"')
     edit.find_prologue(where="up")

diff --git a/res/analyzer.yaml b/res/analyzer.yaml
@@ -19,6 +19,7 @@ broot.ingress.mod.Entry:
     MenuTopWidget_getTabs: [null, '$MenuTabId[]']
     MenuTabId_onToString: [null, $String, $MenuTabId]
     MenuControllerImpl_onSelectTab: [null, V, $MenuTabId]
+    Mod_ShowAgentTab: [null, Z]
     AssetFinder_onGetAssetPath: [null, Lcom/badlogic/gdx/files/FileHandle;, $String]
     PortalInfoDialog_onStatsTableCreated: [null, V, $PortalInfoDialog, $Table]
     PortalInfoDialog_onPlayerLocationChanged: [null, V]
@@ -27,7 +28,6 @@ broot.ingress.mod.Entry:
     ScannerTouchHandler_shouldSwapTouchMenuButtons: [null, Z]
     ZoomInMode_shouldZoomIn: [null, Z]
     PortalInfoDialog_getOpenDelay: [null, F, F]
-#    PortalUpgrade_onStatsTableCreated: [null, V, $PortalUpgradeUi, $Table]
     GpsSensor_lockTimeout: [null, J]
     PortalUpgrade_onDispose: [null, V]
     PortalUpgrade_getResonatorBrowserHeight: [null, I, I]
@@ -369,13 +369,23 @@ com.nianticproject.ingress.common.ui.elements.AvatarPlayerStatusBar_OpsButtonLis
     init: [<init>, V, $AvatarPlayerStatusBar]
     clicked: [clicked, V, Lcom/badlogic/gdx/scenes/scene2d/InputEvent;, F, F]
 
-#  find_by_method: init
   find:
     - [by_super,  false, true, Lcom/badlogic/gdx/scenes/scene2d/utils/ClickListener;]
     - [by_method, false, true, init]
     - [by_method, false, true, clicked]
     - [by_string, false, true, Lcom/nianticproject/ingress/common/inventory]
 
+com.nianticproject.ingress.common.ui.elements.AvatarPlayerStatusBar_AvatarListener:
+  methods:
+    init: [<init>, V, $AvatarPlayerStatusBar]
+    clicked: [clicked, V, Lcom/badlogic/gdx/scenes/scene2d/InputEvent;, F, F]
+
+  find:
+    - [by_super,  false, true, Lcom/badlogic/gdx/scenes/scene2d/utils/ClickListener;]
+    - [by_method, false, true, init]
+    - [by_method, false, true, clicked]
+    - [by_string, false, true, $MyProfileActivity]
+
 com.nianticproject.ingress.common.ui.elements.OldPlayerStatusBar_OpsButtonListener:
   methods:
     init: [<init>, V, $OldPlayerStatusBar]

diff --git a/src/broot/ingress/mod/AboutModActivity.java b/src/broot/ingress/mod/AboutModActivity.java
@@ -356,8 +356,8 @@ private void updateUiTweaksValues(boolean save) {
             case 900000: gpsLockLabel = "15min"; break;
             default: gpsLockLabel = "Unknown";
         }
-        uiTweaksItem.buttons.get(9).setText(gpsLockLabel);
-        uiTweaksItem.buttons.get(10).setText(Config.changePortalInfoDialog ? "ON" : "OFF");
+        uiTweaksItem.buttons.get(8).setText(gpsLockLabel);
+        uiTweaksItem.buttons.get(9).setText(Config.changePortalInfoDialog ? "ON" : "OFF");
     }
 
     private void updateUiVariantValue() {

diff --git a/src/broot/ingress/mod/Entry.java b/src/broot/ingress/mod/Entry.java
@@ -255,6 +255,10 @@ public static boolean ItemActionHandler_recycleAnimationsEnabled() {
         return Config.recycleAnimationsEnabled;
     }
 
+    public static boolean Mod_ShowAgentTab() {
+        return Config.showAgentTab;
+    }
+
     public static boolean vibrationEnabled() {
         return Config.vibration;
     }