From 7b4508062f4a538cf797274e77e47e3d5a73b26d Mon Sep 17 00:00:00 2001
From: Guus der Kinderen <guus.der.kinderen@gmail.com>
Date: Fri, 4 Oct 2024 22:23:40 +0200
Subject: [PATCH] Fixes compatibility issue with Openfire 4.9.0

This replaces API of Openfire that was removed in Openfire 4.9.0. The plugin remains compatible with Openfire 4.8.0 and later.

Fixes #200
---
 changelog.html                                       |  5 +++++
 plugin.xml                                           |  2 +-
 .../plugin/rest/controller/SessionController.java    | 12 ++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/changelog.html b/changelog.html
index 72bc7f64d..71050062f 100644
--- a/changelog.html
+++ b/changelog.html
@@ -44,6 +44,11 @@ <h1>
 REST API Plugin Changelog
 </h1>
 
+<p><b>1.11.1</b> (tbd)</p>
+<ul>
+    <li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/200'>#200</a>] - Fix compatibility issue with Openfire 4.9.0.</li>
+</ul>
+
 <p><b>1.11.0</b> June 25, 2024</p>
 <ul>
     <li>Now requires Openfire 4.8.0 or later</li>
diff --git a/plugin.xml b/plugin.xml
index 2c3c754c9..03d53aac9 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -6,7 +6,7 @@
     <description>Allows administration over a RESTful API.</description>
     <author>Roman Soldatow</author>
     <version>${project.version}</version>
-    <date>2024-06-25</date>
+    <date>2024-10-04</date>
     <minServerVersion>4.8.0</minServerVersion>
     <adminconsole>
         <tab id="tab-server">
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/controller/SessionController.java b/src/java/org/jivesoftware/openfire/plugin/rest/controller/SessionController.java
index 6eb929a0d..5edd523da 100644
--- a/src/java/org/jivesoftware/openfire/plugin/rest/controller/SessionController.java
+++ b/src/java/org/jivesoftware/openfire/plugin/rest/controller/SessionController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022.
+ * Copyright (c) 2022-2024 Ignite Realtime Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -130,14 +130,14 @@ private SessionEntities convertToSessionEntities(Collection<ClientSession> clien
             }
 
             String status = "";
-            if (clientSession.getStatus() == Session.STATUS_CLOSED) {
+            if (clientSession.getStatus() == Session.Status.CLOSED) {
                 status = "Closed";
-            } else if (clientSession.getStatus() == Session.STATUS_CONNECTED) {
+            } else if (clientSession.getStatus() == Session.Status.CONNECTED) {
                 status = "Connected";
-            } else if (clientSession.getStatus() == Session.STATUS_AUTHENTICATED) {
+            } else if (clientSession.getStatus() == Session.Status.AUTHENTICATED) {
                 status = "Authenticated";
             } else {
-                status = "Unkown";
+                status = "Unknown";
             }
             session.setSessionStatus(status);
 
@@ -170,7 +170,7 @@ private SessionEntities convertToSessionEntities(Collection<ClientSession> clien
 
             session.setCreationDate(clientSession.getCreationDate());
             session.setLastActionDate(clientSession.getLastActiveDate());
-            session.setSecure(clientSession.isSecure());
+            session.setSecure(clientSession.isEncrypted());
 
             sessions.add(session);
         }