Commit a4c5ae61 authored by Luboš Horáček's avatar Luboš Horáček

Opravy chyb při startu aplikace

parent ec817796
......@@ -48,7 +48,7 @@
android:value="Tablexia.db" />
<meta-data
android:name="AA_DB_VERSION"
android:value="7" />
android:value="6" />
<meta-data
android:name="AA_SERIALIZERS"
android:value="cz.nic.tablexia.menu.MenuEnumSerializer" />
......
/*******************************************************************************
* Tablexia
* Tablexia
*
* Copyright (C) 2013 CZ NIC z.s.p.o. <podpora at nic dot cz>
*
......@@ -33,10 +33,10 @@ public class User extends Model {
@Column(name = "NickName")
private String nickName;
@Expose
@Column(name = "Age")
@Column(name = "Age")
private int age;
@Expose
@Column(name = "IsMale")
@Column(name = "IsMale")
private boolean isMale;
@Expose
@Column(name = "Avatar")
......@@ -49,7 +49,7 @@ public class User extends Model {
private boolean isHelp;
@Column(name = "SightseeingShown")
private boolean sightseeingShown;
// USER SCOPE TROPHIES
@Column(name = "Consecutively3Days")
private boolean consecutively3Days;
......@@ -78,7 +78,7 @@ public class User extends Model {
this.sightseeingShown = sightseeingShown;
this.signatureFileName = signatureFileName;
deleted = false;
consecutively3Days = false;
consecutively5Days = false;
consecutively8Days = false;
......@@ -123,7 +123,7 @@ public class User extends Model {
public void setDeleted(Boolean deleted) {
this.deleted = deleted;
}
public boolean isConsecutively3Days() {
return consecutively3Days;
}
......@@ -171,11 +171,11 @@ public class User extends Model {
public void setConsecutivelyAllGames0Stars(boolean consecutivelyAllGames0Stars) {
this.consecutivelyAllGames0Stars = consecutivelyAllGames0Stars;
}
public static boolean existsUsersForName(String nickName) {
return (new Select().from(User.class).where("NickName = ?", nickName).executeSingle()) != null;
}
public static User getUsersForId(long id) {
return new Select().from(User.class).where("Id = ?", id).executeSingle();
}
......@@ -204,12 +204,12 @@ public class User extends Model {
return "[" + getId() + "] " + nickName + " (AGE: " + age + ", MALE: " + isMale + ", AVATAR: " + avatar + ")";
}
public boolean isSightseeingShown() {
return sightseeingShown;
}
public boolean isSightseeingShown() {
return sightseeingShown;
}
public void setSightseeingShownAndSave(boolean sightseeingShown) {
this.sightseeingShown = sightseeingShown;
save();
}
public void setSightseeingShownAndSave(boolean sightseeingShown) {
this.sightseeingShown = sightseeingShown;
save();
}
}
File added
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment