Seil0/ProjectLaogai
1
0
Fork 0
Code Issues 4 Pull Requests Releases 13 Wiki Activity

merge version 0.5.1 #38

Manually merged
Seil0 merged 11 commits from develop into master 2020-02-05 14:15:04 +01:00
Conversation 0 Commits 11 Files Changed 26 +184 -54
22 changed files with 184 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9d2de3fcb3 - Show all commits

6
app/src/main/java/org/mosad/seil0/projectlaogai/controller/CacheController.kt
View File

@ -103,7 +103,7 @@ class CacheController(cont: Context) {
val fileReader = FileReader(file) val fileReader = FileReader(file)
val bufferedReader = BufferedReader(fileReader) val bufferedReader = BufferedReader(fileReader)
val coursesObject = JsonParser().parse(bufferedReader.readLine()).asJsonObject val coursesObject = JsonParser.parseString(bufferedReader.readLine()).asJsonObject
coursesList = Gson().fromJson(coursesObject.getAsJsonArray("courses"), object : TypeToken<List<Course>>() {}.type) coursesList = Gson().fromJson(coursesObject.getAsJsonArray("courses"), object : TypeToken<List<Course>>() {}.type)
} }
@ -122,7 +122,7 @@ class CacheController(cont: Context) {
val fileReader = FileReader(file) val fileReader = FileReader(file)
val bufferedReader = BufferedReader(fileReader) val bufferedReader = BufferedReader(fileReader)
val mensaObject = JsonParser().parse(bufferedReader.readLine()).asJsonObject val mensaObject = JsonParser.parseString(bufferedReader.readLine()).asJsonObject
mensaMenu = GsonBuilder().create().fromJson(mensaObject, MensaMenu().javaClass) mensaMenu = GsonBuilder().create().fromJson(mensaObject, MensaMenu().javaClass)
} }
@ -141,7 +141,7 @@ class CacheController(cont: Context) {
val fileReader = FileReader(file) val fileReader = FileReader(file)
val bufferedReader = BufferedReader(fileReader) val bufferedReader = BufferedReader(fileReader)
val timetableObject = JsonParser().parse(bufferedReader.readLine()).asJsonObject val timetableObject = JsonParser.parseString(bufferedReader.readLine()).asJsonObject
// make sure you add the single weeks in the exact order! // make sure you add the single weeks in the exact order!
if (timetables.size > week) { if (timetables.size > week) {