Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check for webView nullability when accessing the WeakReference #2014

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Check for webView nullability when accessing the WeakReference #2014

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions src/android/LocalNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,17 +714,19 @@ private static synchronized void sendJavascript(final String js) {
}

final CordovaWebView view = webView.get();

((Activity) (view.getContext())).runOnUiThread(new Runnable() {
public void run() {
view.loadUrl("javascript:" + js);
View engineView = view.getEngine().getView();

if (!isInForeground()) {
engineView.dispatchWindowVisibilityChanged(View.VISIBLE);

if (view != null) {
((Activity) (view.getContext())).runOnUiThread(new Runnable() {
public void run() {
view.loadUrl("javascript:" + js);
View engineView = view.getEngine().getView();

if (!isInForeground()) {
engineView.dispatchWindowVisibilityChanged(View.VISIBLE);
}
}
}
});
});
}
}

/**
Expand All @@ -737,6 +739,10 @@ public static boolean isInForeground() {

CordovaWebView view = webView.get();

if (view == null) {
return false;
}

KeyguardManager km = (KeyguardManager) view.getContext().getSystemService(Context.KEYGUARD_SERVICE);

// noinspection SimplifiableIfStatement
Expand Down