Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-01-18 19:59:29 +01:00
parent 767e49f882
commit 0c12ff9ea1

View File

@ -91,7 +91,7 @@ public class UserUtils {
public Completable deleteUser(String username, String serverUrl) { public Completable deleteUser(String username, String serverUrl) {
Result findUserQueryResult = dataStore.select(User.class).where(UserEntity.USERNAME.eq(username). Result findUserQueryResult = dataStore.select(User.class).where(UserEntity.USERNAME.eq(username).
and(UserEntity.BASE_URL.eq(serverUrl.toLowerCase()))).limit(1).get(); and(UserEntity.BASE_URL.eq(serverUrl))).limit(1).get();
UserEntity user = (UserEntity) findUserQueryResult.firstOrNull(); UserEntity user = (UserEntity) findUserQueryResult.firstOrNull();
@ -127,7 +127,7 @@ public class UserUtils {
public boolean getIfUserWithUsernameAndServer(String username, String server) { public boolean getIfUserWithUsernameAndServer(String username, String server) {
Result findUserQueryResult = dataStore.select(User.class).where(UserEntity.USERNAME.eq(username) Result findUserQueryResult = dataStore.select(User.class).where(UserEntity.USERNAME.eq(username)
.and(UserEntity.BASE_URL.eq(server.toLowerCase()))) .and(UserEntity.BASE_URL.eq(server)))
.limit(1).get(); .limit(1).get();
return findUserQueryResult.firstOrNull() != null; return findUserQueryResult.firstOrNull() != null;
@ -158,7 +158,7 @@ public class UserUtils {
Result findUserQueryResult; Result findUserQueryResult;
if (internalId == null) { if (internalId == null) {
findUserQueryResult = dataStore.select(User.class).where(UserEntity.USERNAME.eq(username). findUserQueryResult = dataStore.select(User.class).where(UserEntity.USERNAME.eq(username).
and(UserEntity.BASE_URL.eq(serverUrl.toLowerCase()))).limit(1).get(); and(UserEntity.BASE_URL.eq(serverUrl))).limit(1).get();
} else { } else {
findUserQueryResult = dataStore.select(User.class).where(UserEntity.ID.eq(internalId)).get(); findUserQueryResult = dataStore.select(User.class).where(UserEntity.ID.eq(internalId)).get();
} }
@ -167,7 +167,7 @@ public class UserUtils {
if (user == null) { if (user == null) {
user = new UserEntity(); user = new UserEntity();
user.setBaseUrl(serverUrl.toLowerCase()); user.setBaseUrl(serverUrl);
user.setUsername(username); user.setUsername(username);
user.setToken(token); user.setToken(token);