Changeset 73790e23


Ignore:
Timestamp:
Apr 11, 2019 2:33:38 PM (15 months ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
b5a4f16
Parents:
dd5f8b45
Message:

i2ptunnel: Fix NPE creating server tunnel
Add Red25519 sigtype option for servers
Fix if clause in editClient

Location:
apps/i2ptunnel
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java

    rdd5f8b45 r73790e23  
    648648    public String getFilterDefinition(int tunnel) {
    649649        TunnelController tunnelController = getController(tunnel);
    650         String filter = tunnelController.getFilter();
    651         return filter == null ? "" : filter;
     650        if (tunnelController != null) {
     651            String filter = tunnelController.getFilter();
     652            if (filter != null)
     653                return filter;
     654        }
     655        return "";
    652656    }
    653657   
  • apps/i2ptunnel/jsp/editClient.jsi

    rdd5f8b45 r73790e23  
    529529                    Ed25519-SHA-512</label>
    530530                </span>
    531             </td>
    532         </tr>
    533531<%
    534532              }   // isAvailable
    535 
     533%>
     534            </td>
     535        </tr>
     536<%
    536537            } // isAdvanced
    537538
  • apps/i2ptunnel/jsp/editServer.jsi

    rdd5f8b45 r73790e23  
    742742                    Ed25519-SHA-512</label>
    743743                </span>
     744<%            }
     745              if (editBean.isSigTypeAvailable(11)) { %>
     746                <span class="multiOption">
     747                    <label title="<%=intl._t("Experimental")%>"><input value="11" type="radio" id="startOnLoad" name="sigType" <%=disabled%> <%=(currentSigType==11 ? " checked=\"checked\"" : "")%> class="tickbox" />
     748                    Red25519-SHA-512</label>
     749                </span>
    744750<%            }   // isAvailable
    745751%>
Note: See TracChangeset for help on using the changeset viewer.