Skip to content

Commit 22dd2de

Browse files
Fishbowlerguusdk
authored andcommitted
fixes #222: Don't use deprecated Openfire methods
1 parent c9b40dd commit 22dd2de

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/java/org/jivesoftware/openfire/archive/ConversationUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ private String formatJID(boolean html, JID jid) {
352352
if (html) {
353353
UserManager userManager = UserManager.getInstance();
354354
if (XMPPServer.getInstance().isLocal(jid) &&
355-
userManager.isRegisteredUser(jid.getNode())) {
355+
userManager.isRegisteredUser(jid, true)) {
356356
formattedJID = "<a href='/user-properties.jsp?username=" +
357357
jid.getNode() + "'>" + jid.toBareJID() + "</a>";
358358
}

src/java/org/jivesoftware/openfire/index/LuceneIndexer.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,8 @@ private XMLProperties loadPropertiesFile( File searchDir ) throws IOException
450450
}
451451
// Ignore.
452452
}
453-
return new XMLProperties(indexPropertiesFile);
453+
InputStream stream = new FileInputStream(indexPropertiesFile);
454+
return new XMLProperties(stream);
454455
}
455456

456457
/**

src/java/org/jivesoftware/openfire/plugin/service/LogAPI.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public Response getLoggedServiceNames()
6262

6363
final List<MultiUserChatService> multiUserChatServices = XMPPServer.getInstance().getMultiUserChatManager().getMultiUserChatServices();
6464
final List<String> serviceNames = multiUserChatServices.stream()
65-
.filter(s -> s.getChatRooms().stream().anyMatch(r -> r.isLogEnabled() && r.isPublicRoom()))
65+
.filter(s -> s.getActiveChatRooms().stream().anyMatch(r -> r.isLogEnabled() && r.isPublicRoom()))
6666
.map(MultiUserChatService::getServiceName)
6767
.collect(Collectors.toList() );
6868

@@ -88,7 +88,7 @@ public Response getLoggedServiceNames( @PathParam("serviceName") String serviceN
8888
return Response.noContent().build();
8989
}
9090

91-
final List<String> roomNames = multiUserChatService.getChatRooms().stream()
91+
final List<String> roomNames = multiUserChatService.getActiveChatRooms().stream()
9292
.filter( r -> r.isLogEnabled() && r.isPublicRoom() )
9393
.map( MUCRoom::getName )
9494
.collect(Collectors.toList() );

0 commit comments

Comments
 (0)