Menu
▾
▴
[39791 svn/public] plugins/networks/tor
|
From: <pga...@vu...> - 2014-01-27 16:05:59
|
Revision: 39791
Author: pgardner
Date: 2014-01-27 16:05:50 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
Modified Paths:
--------------
plugins/networks/tor/dist/mac/AzureusTor
plugins/networks/tor/org/parg/azureus/plugins/networks/tor/TorPlugin.java
plugins/networks/tor/org/parg/azureus/plugins/networks/tor/internat/Messages.properties
plugins/networks/tor/org/parg/azureus/plugins/networks/tor/swt/TorPluginUISWT.java
plugins/networks/tor/plugin_install.properties
Added Paths:
-----------
plugins/networks/tor/dist/mac/libevent-2.0.5.dylib
Modified: plugins/networks/tor/dist/mac/AzureusTor
===================================================================
(Binary files differ)
Added: plugins/networks/tor/dist/mac/libevent-2.0.5.dylib
===================================================================
(Binary files differ)
Property changes on: plugins/networks/tor/dist/mac/libevent-2.0.5.dylib
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: plugins/networks/tor/org/parg/azureus/plugins/networks/tor/TorPlugin.java
===================================================================
--- plugins/networks/tor/org/parg/azureus/plugins/networks/tor/TorPlugin.java 2014-01-25 00:23:08 UTC (rev 39790)
+++ plugins/networks/tor/org/parg/azureus/plugins/networks/tor/TorPlugin.java 2014-01-27 16:05:50 UTC (rev 39791)
@@ -94,6 +94,8 @@
private BooleanParameter prompt_on_use_param;
+ private ActionParameter prompt_reset_param;
+
private ActionParameter browser_install_param;
private ActionParameter browser_launch_param;
@@ -103,7 +105,6 @@
private boolean stop_on_idle;
private boolean prompt_on_use;
private boolean prompt_skip_vuze;
-
private int internal_control_port;
private int internal_socks_port;
@@ -213,7 +214,7 @@
prompt_on_use_param = config_model.addBooleanParameter2( "prompt_on_use", "aztorplugin.prompt_on_use", true );
final BooleanParameter prompt_skip_vuze_param = config_model.addBooleanParameter2( "prompt_skip_vuze", "aztorplugin.prompt_skip_vuze", true );
- final ActionParameter prompt_reset_param = config_model.addActionParameter2( "aztorplugin.ask.clear", "aztorplugin.ask.clear.button" );
+ prompt_reset_param = config_model.addActionParameter2( "aztorplugin.ask.clear", "aztorplugin.ask.clear.button" );
prompt_reset_param.addListener(
new ParameterListener()
@@ -387,6 +388,7 @@
}
});
+ /*
final ActionParameter test_http_proxy_param = config_model.addActionParameter2( "", "!Do It!" );
test_http_proxy_param.setLabelText( "Create HTTP Proxy" );
@@ -441,6 +443,7 @@
}.start();
}
});
+ */
if ( Constants.isWindows || Constants.isOSX ){
@@ -610,7 +613,7 @@
prompt_on_use_param.setEnabled( plugin_enabled );
prompt_skip_vuze_param.setEnabled( plugin_enabled && prompt_on_use );
- prompt_reset_param.setEnabled( plugin_enabled && prompt_on_use );
+ prompt_reset_param.setEnabled( plugin_enabled && prompt_on_use && prompt_decisions.size() > 0 );
dr_info_param.setEnabled( plugin_enabled );
dr_param.setEnabled( plugin_enabled );
@@ -1175,6 +1178,13 @@
ProcessBuilder pb = GeneralUtils.createProcessBuilder( plugin_dir, cmd_list.toArray(new String[cmd_list.size()]), null );
+ if ( Constants.isOSX ){
+
+ pb.environment().put(
+ "DYLD_LIBRARY_PATH",
+ exe_file.getParentFile().getAbsolutePath());
+ }
+
final Process proc = pb.start();
new AEThread2( "procread" )
@@ -1569,6 +1579,8 @@
}
}
+ prompt_reset_param.setEnabled( prompt_decisions.size() > 0);
+
logPromptDecisions();
}
}
@@ -1585,8 +1597,16 @@
str += (str.length()==0?"":",") + s;
}
+ prompt_reset_param.setEnabled( prompt_decisions.size() > 0);
+
plugin_config.setPluginParameter( "prompt.decisions", str );
+ try{
+ plugin_config.save();
+
+ }catch( Throwable e ){
+ }
+
logPromptDecisions();
}
}
Modified: plugins/networks/tor/org/parg/azureus/plugins/networks/tor/internat/Messages.properties
===================================================================
--- plugins/networks/tor/org/parg/azureus/plugins/networks/tor/internat/Messages.properties 2014-01-25 00:23:08 UTC (rev 39790)
+++ plugins/networks/tor/org/parg/azureus/plugins/networks/tor/internat/Messages.properties 2014-01-27 16:05:50 UTC (rev 39791)
@@ -40,4 +40,6 @@
aztorplugin.browser.launch=Launch a Tor Browser
aztorplugin.browser.launch.button=Launch
aztorplugin.browser.launch.fail=Launch Failed
-aztorplugin.browser.launch.fail.msg=Tor Browser launch failed: %1
\ No newline at end of file
+aztorplugin.browser.launch.fail.msg=Tor Browser launch failed: %1
+aztorplugin.ask.sure.title=Verify Action
+aztorplugin.ask.sure.msg=You have selected to silently decline proxy connections, please verify that this is your intent.\n\nIf needed you can change this decision later by going to Tools->Options->Plugins->Tor Helper and selecting 'forget remembered decisions'.
\ No newline at end of file
Modified: plugins/networks/tor/org/parg/azureus/plugins/networks/tor/swt/TorPluginUISWT.java
===================================================================
--- plugins/networks/tor/org/parg/azureus/plugins/networks/tor/swt/TorPluginUISWT.java 2014-01-25 00:23:08 UTC (rev 39790)
+++ plugins/networks/tor/org/parg/azureus/plugins/networks/tor/swt/TorPluginUISWT.java 2014-01-27 16:05:50 UTC (rev 39791)
@@ -53,9 +53,12 @@
import org.gudy.azureus2.plugins.utils.LocaleUtilities;
import org.gudy.azureus2.ui.swt.Utils;
import org.gudy.azureus2.ui.swt.components.shell.ShellFactory;
+import org.gudy.azureus2.ui.swt.shells.MessageBoxShell;
import org.parg.azureus.plugins.networks.tor.TorPlugin;
import org.parg.azureus.plugins.networks.tor.TorPluginUI;
+import com.aelitis.azureus.ui.UserPrompterResultListener;
+
public class
TorPluginUISWT
implements TorPluginUI
@@ -261,21 +264,64 @@
String[] buttons = { MessageText.getString("Button.yes"), MessageText.getString("Button.no") };
int defaultButtonPos = 0;
- Listener buttonListener = new Listener() {
-
- public void handleEvent(Event event) {
- result[0] = ((Integer) event.widget.getData()).intValue() == 0;
- if ( rc_check.getSelection()){
+ Listener buttonListener =
+ new Listener()
+ {
+ public void
+ handleEvent(
+ Event event )
+ {
int index = options.getSelectionIndex();
- if ( index == 0 ){
- remembered[0] = "*";
+
+ boolean yes_selected = ((Integer) event.widget.getData()).intValue() == 0;
+ boolean all_domains = index==0;
+ boolean remember = rc_check.getSelection();
+
+ if ( remember && all_domains && !yes_selected ){
+
+ MessageBoxShell mb = new MessageBoxShell(
+ SWT.ICON_WARNING | SWT.YES | SWT.NO,
+ MessageText.getString("aztorplugin.ask.sure.title"),
+ MessageText.getString("aztorplugin.ask.sure.msg"));
+
+ mb.setDefaultButtonUsingStyle(SWT.NO);
+
+ mb.setParent( shell );
+
+ mb.open(
+ new UserPrompterResultListener()
+ {
+ public void
+ prompterClosed(
+ int returnVal )
+ {
+ if (returnVal != SWT.YES) {
+
+ return;
+ }
+
+ result[0] = false;
+ remembered[0] = "*";
+
+ shell.dispose();
+ }
+ });
+
}else{
- remembered[0] = options.getItem(index);
+ result[0] = yes_selected;
+
+ if ( remember ){
+
+ if ( all_domains ){
+ remembered[0] = "*";
+ }else{
+ remembered[0] = options.getItem(index);
+ }
+ }
+ shell.dispose();
}
}
- shell.dispose();
- }
- };
+ };
List<Button> swtButtons = new ArrayList<Button>();
Modified: plugins/networks/tor/plugin_install.properties
===================================================================
--- plugins/networks/tor/plugin_install.properties 2014-01-25 00:23:08 UTC (rev 39790)
+++ plugins/networks/tor/plugin_install.properties 2014-01-27 16:05:50 UTC (rev 39791)
@@ -1 +1,2 @@
%plugin%/AzureusTor,chmod,755
+%plugin%/libevent-2.0.5.dylib,chmod,755
|
