If we have to use fake browser for donation then assume donated

BiglySoftware · Nov 16, 2023 · 209f447 · 209f447
1 parent dcc57e3
commit 209f447
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 8 deletions.
diff --git a/uis/src/com/biglybt/ui/swt/BrowserWrapper.java b/uis/src/com/biglybt/ui/swt/BrowserWrapper.java
@@ -20,6 +20,8 @@
 
 package com.biglybt.ui.swt;
 
+import java.util.function.Consumer;
+
 import org.eclipse.swt.browser.CloseWindowListener;
 import org.eclipse.swt.browser.LocationListener;
 import org.eclipse.swt.browser.ProgressListener;
@@ -96,6 +98,11 @@
 	setUrl(
 		String		url );
 
+	public abstract void
+	setFakeUrl(
+		String				url,
+		Consumer<String>	click_listener );
+
 	public abstract void
 	setText(
 		String		text );

diff --git a/uis/src/com/biglybt/ui/swt/BrowserWrapperFake.java b/uis/src/com/biglybt/ui/swt/BrowserWrapperFake.java
@@ -24,6 +24,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Consumer;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.SWTError;
@@ -56,7 +57,9 @@
 	private Label			link_label;
 	private Label			description_label;
 
-	private String 			url;
+	private String 				url;
+	private Consumer<String>	url_listener;
+
 	private String			description;
 
 	private List<LocationListener>		location_listeners 	= new ArrayList<>();
@@ -147,14 +150,25 @@ public void widgetSelected(SelectionEvent e) {
 		link_label.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseDoubleClick(MouseEvent e) {
-				Utils.launch( url );
+				launch();
 			}
 			@Override
 			public void mouseUp(MouseEvent e) {
 
 				if ( e.button == 1 && e.stateMask != SWT.CONTROL){
 
-					Utils.launch( url );
+					launch();
+				}
+			}
+
+			private void
+			launch()
+			{
+				Utils.launch( url );
+
+				if ( url_listener != null ){
+
+					url_listener.accept( url );
 				}
 			}
 		});
@@ -260,13 +274,31 @@ public String getText() {
 		return( url );
 	}
 
+	@Override
+	public void
+	setFakeUrl(
+		String				url,
+		Consumer<String>	listener )
+	{
+		setUrl( url, listener );
+	}
+
 	@Override
 	public void
 	setUrl(
-		final String		_url )
+		String		url )
 	{
-		url		= _url;
-
+		setUrl( url, null );
+	}
+
+	private void
+	setUrl(
+		final String		_url,
+		Consumer<String>	_listener )
+	{
+		url				= _url;
+		url_listener	= _listener;
+
 		Utils.execSWTThread(
 			new Runnable()
 			{

diff --git a/uis/src/com/biglybt/ui/swt/BrowserWrapperSWT.java b/uis/src/com/biglybt/ui/swt/BrowserWrapperSWT.java
@@ -22,6 +22,8 @@
 
 package com.biglybt.ui.swt;
 
+import java.util.function.Consumer;
+
 import org.eclipse.swt.browser.Browser;
 //import org.eclipse.swt.chromium.Browser;
 
@@ -38,6 +40,8 @@
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
 
+import com.biglybt.core.util.Debug;
+
 public class
 BrowserWrapperSWT
 	extends BrowserWrapper
@@ -128,6 +132,17 @@
 		return( browser.getUrl());
 	}
 
+	@Override
+	public void
+	setFakeUrl(
+		String				url,
+		Consumer<String>	listener )
+	{
+		Debug.out( "Should be called on fake browser..." );
+
+		setUrl(url);
+	}
+
 	@Override
 	public void
 	setUrl(

diff --git a/uis/src/com/biglybt/ui/swt/donations/DonationWindow.java b/uis/src/com/biglybt/ui/swt/donations/DonationWindow.java
@@ -408,11 +408,13 @@ public void changed(LocationEvent event) {
 
 		if ( browser.isFake()){
 
-			browser.setUrl( Constants.URL_DONATION );
+			browser.setFakeUrl( Constants.URL_DONATION, (s)->{
+				neverAskAgain();
+			});
 
 			browser.setText( "Please follow the link to donate via an external browser" );
 
-			shell.setSize( 400, 500 );
+			shell.setSize( 800, 500 );
 
 			Utils.centreWindow(shell);