Author: toad
Date: 2008-04-12 12:11:42 +0000 (Sat, 12 Apr 2008)
New Revision: 19221
Modified:
trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
Log:
Make the alert non-dismissable if there is no UDP connectivity, since this is a
critical error and may prevent freenet from being usable at all.
Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-04-12
12:09:28 UTC (rev 19220)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-04-12
12:11:42 UTC (rev 19221)
@@ -37,10 +37,12 @@
final boolean suggestPortForward;
private int[] portsNotForwarded;
+ boolean noDismiss;
- public MyUserAlert(String title, String text, boolean
suggestPortForward, short code) {
+ public MyUserAlert(String title, String text, boolean
suggestPortForward, short code, boolean noDismiss) {
super(false, title, text, null, code, true,
L10n.getString("UserAlert.hide"), false, null);
this.suggestPortForward = suggestPortForward;
+ this.noDismiss = noDismiss;
portsNotForwarded = new int[] { };
}
@@ -89,6 +91,7 @@
}
public boolean userCanDismiss() {
+ if(noDismiss) return true;
// If no ports need forwarding, make it dismissable
immediately.
if(!suggestPortForward) return true;
// Prevent NPE.
@@ -123,13 +126,13 @@
this.node = node;
this.detector = detector;
noConnectionAlert = new MyUserAlert(
l10n("noConnectivityTitle"), l10n("noConnectivity"),
- true, UserAlert.ERROR);
+ true, UserAlert.ERROR, true);
symmetricAlert = new MyUserAlert(l10n("symmetricTitle"),
l10n("symmetric"),
- true, UserAlert.ERROR);
+ true, UserAlert.ERROR, false);
portRestrictedAlert = new
MyUserAlert(l10n("portRestrictedTitle"), l10n("portRestricted"),
- true, UserAlert.WARNING);
+ true, UserAlert.WARNING, false);
restrictedAlert = new MyUserAlert(l10n("restrictedTitle"),
l10n("restricted"),
- false, UserAlert.MINOR);
+ false, UserAlert.MINOR, false);
}
public int[] getUDPPortsNotForwarded() {
