safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-38: Fix compatibility with recent ActivityRecord changes.

Browse Source
This commit is contained in:
Nick Couchman
2017-09-28 10:48:43 -04:00
parent 531725671b
commit 498400ef0d
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectUserContext.java
View File

@@ -24,16 +24,18 @@ import java.util.Collections;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.form.Form;
import org.apache.guacamole.net.auth.ActiveConnection;
import org.apache.guacamole.net.auth.ActivityRecord;
import org.apache.guacamole.net.auth.ActivityRecordSet;
import org.apache.guacamole.net.auth.AuthenticationProvider;
import org.apache.guacamole.net.auth.Connection;
import org.apache.guacamole.net.auth.ConnectionGroup;
import org.apache.guacamole.net.auth.ConnectionRecordSet;
import org.apache.guacamole.net.auth.ConnectionRecord;
import org.apache.guacamole.net.auth.Directory;
import org.apache.guacamole.net.auth.SharingProfile;
import org.apache.guacamole.net.auth.User;
import org.apache.guacamole.net.auth.UserContext;
import org.apache.guacamole.net.auth.simple.SimpleActivityRecordSet;
import org.apache.guacamole.net.auth.simple.SimpleConnectionGroupDirectory;
import org.apache.guacamole.net.auth.simple.SimpleConnectionRecordSet;
import org.apache.guacamole.net.auth.simple.SimpleDirectory;
import org.apache.guacamole.net.auth.simple.SimpleUser;
import org.apache.guacamole.net.auth.simple.SimpleUserDirectory;
@@ -130,6 +132,11 @@ public class QuickConnectUserContext implements UserContext {
return null;
}
@Override
public void invalidate() {
// Do nothing.
}
@Override
public AuthenticationProvider getAuthenticationProvider() {
return authProvider;
@@ -141,6 +148,12 @@ public class QuickConnectUserContext implements UserContext {
return userDirectory;
}
@Override
public ActivityRecordSet<ActivityRecord> getUserHistory()
throws GuacamoleException {
return new SimpleActivityRecordSet<ActivityRecord>();
}
@Override
public Directory<Connection> getConnectionDirectory()
throws GuacamoleException {
@@ -171,9 +184,9 @@ public class QuickConnectUserContext implements UserContext {
}
@Override
public ConnectionRecordSet getConnectionHistory()
public ActivityRecordSet<ConnectionRecord> getConnectionHistory()
throws GuacamoleException {
return new SimpleConnectionRecordSet();
return new SimpleActivityRecordSet<ConnectionRecord>();
}
@Override

6
extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnection.java
View File

@@ -20,6 +20,7 @@
package org.apache.guacamole.auth.quickconnect;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.guacamole.GuacamoleException;
@@ -170,4 +171,9 @@ public class QuickConnection extends AbstractConnection {
return Collections.<ConnectionRecord>emptyList();
}
@Override
public Date getLastActive() {
return null;
}
}