fixing autoload bug

Author: AnwarMohamed

lib/msf/base/sessions/meterpreter_options.rb

@@ -59,6 +59,12 @@ def on_session(session)
       end
     end
 
+    if session.platform =~ /android/i
+      if (datastore['AutoLoadAndroid'])
+        session.load_android
+      end
+    end
+
     [ 'InitialAutoRunScript', 'AutoRunScript' ].each do |key|
       if (datastore[key].empty? == false)
         args = Shellwords.shellwords( datastore[key] )

modules/payloads/stages/android/meterpreter.rb

@@ -48,13 +48,4 @@ def generate_stage
     # it from, and then finally the meterpreter stage
     java_string(clazz) + java_string(metstage) + java_string(met)
   end
-
-  def on_session(session)
-    super
-    framework.sessions.schedule Proc.new {
-      if (datastore['AutoLoadAndroid'])
-        session.load_android
-      end
-    }
-  end
 end