Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: src/org/adblockplus/android/ProxyService.java

Issue 8943041: ABP/Android Notification not showing fix (Closed)
Patch Set: Created Nov. 23, 2012, 1:13 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/org/adblockplus/android/ProxyService.java
===================================================================
--- a/src/org/adblockplus/android/ProxyService.java
+++ b/src/org/adblockplus/android/ProxyService.java
@@ -269,7 +269,7 @@
ongoingNotification.setLatestEventInfo(getApplicationContext(), getText(R.string.app_name), msg, contentIntent);
startForeground(ONGOING_NOTIFICATION_ID, ongoingNotification);
- sendBroadcast(new Intent(BROADCAST_STATE_CHANGED).putExtra("enabled", true).putExtra("port", port).putExtra("manual", !transparent && !nativeProxy));
+ sendBroadcast(new Intent(BROADCAST_STATE_CHANGED).putExtra("enabled", true).putExtra("port", port).putExtra("manual", isManual()));
Log.i(TAG, "Service started");
}
@@ -461,6 +461,14 @@
}
/**
+ * Checks if user has to set proxy settings manually
+ */
+ public boolean isManual()
+ {
+ return !transparent && !nativeProxy;
+ }
+
+ /**
* Checks if specified host is local.
*/
private static final boolean isLocalHost(String host)
« src/org/adblockplus/android/Preferences.java ('K') | « src/org/adblockplus/android/Preferences.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld