diff --git a/app/release/app-release.apk b/app/release/app-release.apk index d6edaf6..e971553 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/src/main/java/eu/smoser/epv/Database.kt b/app/src/main/java/eu/smoser/epv/Database.kt index b9bbf81..b7857af 100644 --- a/app/src/main/java/eu/smoser/epv/Database.kt +++ b/app/src/main/java/eu/smoser/epv/Database.kt @@ -23,6 +23,7 @@ fun CoroutineScope.executeAsyncTask( data class User( @PrimaryKey val uid: Long, @ColumnInfo(name = "privilegien") val privilegien: Int, + @ColumnInfo(name = "name") val name: String, ) @Dao @@ -36,8 +37,8 @@ interface UserDao { @Query("SELECT * FROM user WHERE uid == :id") fun findById(id: Long): User - @Query("UPDATE user SET privilegien = :newPriv WHERE uid == :id") - fun updatePrivilegien(id: Long, newPriv: Int) + @Query("UPDATE user SET privilegien = :newPriv, name = :name WHERE uid == :id") + fun update(id: Long, newPriv: Int, name: String) @Insert fun insert(user: User) @@ -46,7 +47,7 @@ interface UserDao { fun delete(user: User) } -@Database(entities = [User::class], version = 2) +@Database(entities = [User::class], version = 3) abstract class AppDatabase : RoomDatabase() { abstract fun userDao(): UserDao? diff --git a/app/src/main/java/eu/smoser/epv/ResultActivity.kt b/app/src/main/java/eu/smoser/epv/ResultActivity.kt index 0b233f7..b5f45b1 100644 --- a/app/src/main/java/eu/smoser/epv/ResultActivity.kt +++ b/app/src/main/java/eu/smoser/epv/ResultActivity.kt @@ -10,7 +10,7 @@ import java.lang.Exception class ResultActivity : AppCompatActivity() { private var search = String() - private var user = User(0, 0) + private var user = User(0, 0, "") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -26,20 +26,21 @@ class ResultActivity : AppCompatActivity() { val dao = AppDatabase.getInstance(this@ResultActivity).userDao() var tempUser = dao?.findById(search.toLong()) if(tempUser == null) { - tempUser = User(search.toLong(), 0) + tempUser = User(search.toLong(), 0, "") dao?.insert(tempUser) } tempUser }, onPostExecute = { user = it findViewById(R.id.textViewId).text = user.uid.toString() + setCurrentName(user.name) setCurrentPrivilegien(user.privilegien) }) findViewById