Skip to content

Commit 65b6f51

Browse files
committed
Support replying to proposed file
1 parent d19f3ce commit 65b6f51

File tree

4 files changed

+32
-6
lines changed

4 files changed

+32
-6
lines changed

src/freenet/node/useralerts/DownloadFeedUserAlert.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import freenet.node.PeerNode;
1111
import freenet.support.HTMLNode;
1212

13-
public class DownloadFeedUserAlert extends AbstractUserAlert {
13+
public class DownloadFeedUserAlert extends AbstractUserAlert implements UserAlertFromPeer {
1414
private final WeakReference<PeerNode> peerRef;
1515
private final FreenetURI uri;
1616
private final int fileNumber;
@@ -47,6 +47,11 @@ public String getText() {
4747
return sb.toString();
4848
}
4949

50+
@Override
51+
public String getMessageText() {
52+
return description == null ? "" : description;
53+
}
54+
5055
@Override
5156
public String getShortText() {
5257
return getTitle();
@@ -71,6 +76,14 @@ public HTMLNode getHTMLText() {
7176
return alertNode;
7277
}
7378

79+
@Override
80+
public PeerNode getSourceNode() {
81+
if (peerRef == null) {
82+
return null;
83+
}
84+
return peerRef.get();
85+
}
86+
7487
@Override
7588
public String dismissButtonText() {
7689
return l10n("delete");

src/freenet/node/useralerts/N2NTMUserAlert.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import freenet.support.HTMLNode;
1616

1717
// Node To Node Text Message User Alert: messaging between users
18-
public class N2NTMUserAlert extends AbstractUserAlert {
18+
public class N2NTMUserAlert extends AbstractUserAlert implements UserAlertFromPeer {
1919
private final WeakReference<PeerNode> peerRef;
2020
private final String messageText;
2121
private final int fileNumber;
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/* This code is part of Freenet. It is distributed under the GNU General
2+
* Public License, version 2 (or at your option any later version). See
3+
* http://www.gnu.org/ for further details of the GPL. */
4+
package freenet.node.useralerts;
5+
6+
import freenet.node.PeerNode;
7+
8+
public interface UserAlertFromPeer {
9+
10+
public PeerNode getSourceNode();
11+
public String getMessageText();
12+
13+
}

src/freenet/node/useralerts/UserAlertManager.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,16 +224,16 @@ public HTMLNode renderAlert(UserAlert userAlert) {
224224
userAlertNode.addChild("div", "class", "infobox-header", userAlert.getTitle());
225225
HTMLNode alertContentNode = userAlertNode.addChild("div", "class", "infobox-content");
226226
alertContentNode.addChild(userAlert.getHTMLText());
227-
if (userAlert instanceof N2NTMUserAlert) {
228-
N2NTMUserAlert n2ntmUserAlert = (N2NTMUserAlert) userAlert;
229-
alertContentNode.addChild(renderReplyButton(n2ntmUserAlert, n2ntmUserAlert.getSourceNode()));
227+
if (userAlert instanceof UserAlertFromPeer) {
228+
UserAlertFromPeer n2nUserAlert = (UserAlertFromPeer) userAlert;
229+
alertContentNode.addChild(renderReplyButton(n2nUserAlert, n2nUserAlert.getSourceNode()));
230230
}
231231
alertContentNode.addChild(renderDismissButton(userAlert, null));
232232

233233
return userAlertNode;
234234
}
235235

236-
private HTMLNode renderReplyButton(N2NTMUserAlert userAlert, PeerNode peerNode) {
236+
private HTMLNode renderReplyButton(UserAlertFromPeer userAlert, PeerNode peerNode) {
237237
HTMLNode form = new HTMLNode("form",
238238
new String[]{"method", "action"},
239239
new String[]{"post", "/send_n2ntm/"});

0 commit comments

Comments
 (0)