X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=30613af97d609d6316dbb65e49d59625af890078;hp=1ee72922d2e590a402035d1580f896c29429f7cf;hb=128580ddb154ce7d4f12108a8a70a8fe12488ffe;hpb=b0e986537b3c2a4992bb28eee8682d1a0207b01a

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 1ee7292..30613af 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -375,68 +375,32 @@ public class WebInterface {
 		return templateContextFactory;
 	}
 
-	/**
-	 * Returns the current session, creating a new session if there is no
-	 * current session.
-	 *
-	 * @param toadletContenxt
-	 *            The toadlet context
-	 * @return The current session, or {@code null} if there is no current
-	 *         session
-	 */
-	private Session getCurrentSession(ToadletContext toadletContenxt) {
-		return getCurrentSession(toadletContenxt, true);
+	private Session getCurrentSessionWithoutCreation(ToadletContext toadletContenxt) {
+		return getSessionManager().useSession(toadletContenxt);
 	}
 
-	/**
-	 * Returns the current session, creating a new session if there is no
-	 * current session and {@code create} is {@code true}.
-	 *
-	 * @param toadletContenxt
-	 *            The toadlet context
-	 * @param create
-	 *            {@code true} to create a new session if there is no current
-	 *            session, {@code false} otherwise
-	 * @return The current session, or {@code null} if there is no current
-	 *         session
-	 */
-	private Session getCurrentSession(ToadletContext toadletContenxt, boolean create) {
-		Session session = getSessionManager().useSession(toadletContenxt);
-		if (create && (session == null)) {
+	private Session getOrCreateCurrentSession(ToadletContext toadletContenxt) {
+		Session session = getCurrentSessionWithoutCreation(toadletContenxt);
+		if (session == null) {
 			session = getSessionManager().createSession(UUID.randomUUID().toString(), toadletContenxt);
 		}
 		return session;
 	}
 
-	/**
-	 * Returns the currently logged in Sone.
-	 *
-	 * @param toadletContext
-	 *            The toadlet context
-	 * @return The currently logged in Sone, or {@code null} if no Sone is
-	 *         currently logged in
-	 */
-	public Sone getCurrentSone(ToadletContext toadletContext) {
-		return getCurrentSone(toadletContext, true);
+	public Sone getCurrentSoneCreatingSession(ToadletContext toadletContext) {
+		Collection<Sone> localSones = getCore().getLocalSones();
+		if (localSones.size() == 1) {
+			return localSones.iterator().next();
+		}
+		return getCurrentSone(getOrCreateCurrentSession(toadletContext));
 	}
 
-	/**
-	 * Returns the currently logged in Sone.
-	 *
-	 * @param toadletContext
-	 *            The toadlet context
-	 * @param create
-	 *            {@code true} to create a new session if no session exists,
-	 *            {@code false} to not create a new session
-	 * @return The currently logged in Sone, or {@code null} if no Sone is
-	 *         currently logged in
-	 */
-	public Sone getCurrentSone(ToadletContext toadletContext, boolean create) {
+	public Sone getCurrentSoneWithoutCreatingSession(ToadletContext toadletContext) {
 		Collection<Sone> localSones = getCore().getLocalSones();
 		if (localSones.size() == 1) {
 			return localSones.iterator().next();
 		}
-		return getCurrentSone(getCurrentSession(toadletContext, create));
+		return getCurrentSone(getCurrentSessionWithoutCreation(toadletContext));
 	}
 
 	/**
@@ -447,7 +411,7 @@ public class WebInterface {
 	 * @return The currently logged in Sone, or {@code null} if no Sone is
 	 *         currently logged in
 	 */
-	public Sone getCurrentSone(Session session) {
+	private Sone getCurrentSone(Session session) {
 		if (session == null) {
 			return null;
 		}
@@ -467,7 +431,7 @@ public class WebInterface {
 	 *            The Sone to set as currently logged in
 	 */
 	public void setCurrentSone(ToadletContext toadletContext, Sone sone) {
-		Session session = getCurrentSession(toadletContext);
+		Session session = getOrCreateCurrentSession(toadletContext);
 		if (sone == null) {
 			session.removeAttribute("Sone.CurrentSone");
 		} else {