Merge pull request #385 from dreifachstein/master

CB-12835: add a Context getter in CordovaInterface
This commit is contained in:
Joe Bowser 2017-11-28 10:34:19 -08:00 committed by GitHub
commit ae823e6c4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions

View File

@ -19,6 +19,7 @@
package org.apache.cordova; package org.apache.cordova;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import org.apache.cordova.CordovaPlugin; import org.apache.cordova.CordovaPlugin;
@ -51,10 +52,18 @@ public interface CordovaInterface {
/** /**
* Get the Android activity. * Get the Android activity.
* *
* If a custom engine lives outside of the Activity's lifecycle the return value may be null.
*
* @return the Activity * @return the Activity
*/ */
public abstract Activity getActivity(); public abstract Activity getActivity();
/**
* Get the Android context.
*
* @return the Context
*/
public Context getContext();
/** /**
* Called when a message is sent to plugin. * Called when a message is sent to plugin.

View File

@ -20,6 +20,7 @@
package org.apache.cordova; package org.apache.cordova;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Build; import android.os.Build;
@ -84,6 +85,11 @@ public class CordovaInterfaceImpl implements CordovaInterface {
return activity; return activity;
} }
@Override
public Context getContext() {
return activity;
}
@Override @Override
public Object onMessage(String id, Object data) { public Object onMessage(String id, Object data) {
if ("exit".equals(id)) { if ("exit".equals(id)) {