Merge branch 'master' into 4.0.x (receiver context)

This commit is contained in:
Andrew Grieve 2014-11-06 16:23:49 -05:00
commit 4859f8f759

View File

@ -287,7 +287,7 @@ public class CoreAndroid extends CordovaPlugin {
}; };
// Register the receiver // Register the receiver
this.cordova.getActivity().registerReceiver(this.telephonyReceiver, intentFilter); webView.getContext().registerReceiver(this.telephonyReceiver, intentFilter);
} }
/* /*
@ -296,6 +296,6 @@ public class CoreAndroid extends CordovaPlugin {
*/ */
public void onDestroy() public void onDestroy()
{ {
this.cordova.getActivity().unregisterReceiver(this.telephonyReceiver); webView.getContext().unregisterReceiver(this.telephonyReceiver);
} }
} }