fixes

Author: parg

core/src/com/biglybt/pifimpl/local/download/DownloadImpl.java

@@ -1675,38 +1675,41 @@ void announceTrackerResultsToListener(DownloadTrackerListener l) {
 	{
 		String class_name = getTrackingName( result );
 
-		if ( class_name != null ){
+		String plugin_id;
+		
+		if ( class_name == null ){
+			
+			plugin_id = "azbpdhdtracker";
+			
+		}else{
+			
+			if ( class_name.equalsIgnoreCase( "I2P" )){
+				
+				plugin_id = "azneti2phelper";
+				
+			}else{
+				
+				plugin_id = class_name;
+			}
+		}
+		
+		boolean skip_announce = false;
+		
+		if ( plugin_id != null ){
 
 			Map all_opts = download_manager.getDownloadState().getMapAttribute( DownloadManagerState.AT_PLUGIN_OPTIONS );
 
 			if ( all_opts != null ){
 
-				Map opts = (Map)all_opts.get( class_name.toLowerCase( Locale.US ));
+				Map opts = (Map)all_opts.get( plugin_id.toLowerCase( Locale.US ));
 
 				if ( opts != null ){
 
 					Number e = (Number)opts.get( "enableannounce" );
 
 					if ( e != null && e.intValue() == 0 ){
 
-						boolean inform = false;
-						
-						try{
-							peer_listeners_mon.enter();
-						
-							inform = announce_response_map.remove( class_name ) != null;
-							
-						}finally{
-
-							peer_listeners_mon.exit();
-						}
-						
-						if ( inform ){
-							
-							download_manager.informTPSChanged();
-						}
-						
-						return;
+						skip_announce = true;
 					}
 				}
 			}
@@ -1762,7 +1765,10 @@ void announceTrackerResultsToListener(DownloadTrackerListener l) {
 			}
 		}
 
-		download_manager.setAnnounceResult( result );
+		if ( !skip_announce ){
+		
+			download_manager.setAnnounceResult( result );
+		}
 
 		if ( new_entry ){
 

core/src/com/biglybt/plugin/simpleapi/SimpleAPIPlugin.java

@@ -843,6 +843,15 @@
 							throw( new Exception( "Plugin id parameter missing" ));
 						}
 
+						if ( plugin_id.equalsIgnoreCase( "dht" )){
+							
+							plugin_id = "azbpdhdtracker";
+							
+						}else if ( plugin_id.equalsIgnoreCase( "I2P" )){
+							
+							plugin_id = "azneti2phelper";
+						}
+						
 						PluginInterface pi = plugin_interface.getPluginManager().getPluginInterfaceByID( plugin_id );
 
 						if ( pi == null ){