fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

importd the Event model

This commit is contained in:
tibbi 2017-01-31 23:45:21 +01:00
parent 2fb9e14686
commit c38ac98f61
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/kotlin/com/simplemobiletools/calendar/asynctasks/FetchGoogleEventsTask.kt
View File

@ -2,7 +2,6 @@ package com.simplemobiletools.calendar.asynctasks
import android.app.Activity import android.app.Activity
import android.os.AsyncTask import android.os.AsyncTask
import android.util.Log
import com.google.api.client.extensions.android.http.AndroidHttp import com.google.api.client.extensions.android.http.AndroidHttp
import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential
import com.google.api.client.googleapis.extensions.android.gms.auth.UserRecoverableAuthIOException import com.google.api.client.googleapis.extensions.android.gms.auth.UserRecoverableAuthIOException
@ -17,12 +16,13 @@ import com.simplemobiletools.calendar.helpers.DAY
import com.simplemobiletools.calendar.helpers.MONTH import com.simplemobiletools.calendar.helpers.MONTH
import com.simplemobiletools.calendar.helpers.WEEK import com.simplemobiletools.calendar.helpers.WEEK
import com.simplemobiletools.calendar.helpers.YEAR import com.simplemobiletools.calendar.helpers.YEAR
import com.simplemobiletools.calendar.models.Event
import com.simplemobiletools.calendar.models.GoogleEvent import com.simplemobiletools.calendar.models.GoogleEvent
import com.simplemobiletools.calendar.models.GoogleEventReminder import com.simplemobiletools.calendar.models.GoogleEventReminder
import java.util.* import java.util.*
// more info about event fields at https://developers.google.com/google-apps/calendar/v3/reference/events/insert // more info about event fields at https://developers.google.com/google-apps/calendar/v3/reference/events/insert
class FetchGoogleEventsTask(val activity: Activity, credential: GoogleAccountCredential) : AsyncTask<Void, Void, List<com.simplemobiletools.calendar.models.Event>>() { class FetchGoogleEventsTask(val activity: Activity, credential: GoogleAccountCredential) : AsyncTask<Void, Void, List<Event>>() {
private val CONFIRMED = "confirmed" private val CONFIRMED = "confirmed"
private val PRIMARY = "primary" private val PRIMARY = "primary"
private val ITEMS = "items" private val ITEMS = "items"
@ -46,7 +46,7 @@ class FetchGoogleEventsTask(val activity: Activity, credential: GoogleAccountCre
.build() .build()
} }
override fun doInBackground(vararg params: Void): List<com.simplemobiletools.calendar.models.Event>? { override fun doInBackground(vararg params: Void): List<Event>? {
try { try {
return getDataFromApi() return getDataFromApi()
} catch (e: Exception) { } catch (e: Exception) {
@ -56,8 +56,8 @@ class FetchGoogleEventsTask(val activity: Activity, credential: GoogleAccountCre
} }
} }
private fun getDataFromApi(): List<com.simplemobiletools.calendar.models.Event> { private fun getDataFromApi(): List<Event> {
val parsedEvents = ArrayList<com.simplemobiletools.calendar.models.Event>() val parsedEvents = ArrayList<Event>()
var currToken = "" var currToken = ""
while (true) { while (true) {
val events = service.events().list(PRIMARY) val events = service.events().list(PRIMARY)
@ -80,8 +80,8 @@ class FetchGoogleEventsTask(val activity: Activity, credential: GoogleAccountCre
return parsedEvents return parsedEvents
} }
private fun parseEvents(json: String): List<com.simplemobiletools.calendar.models.Event> { private fun parseEvents(json: String): List<Event> {
val events = ArrayList<com.simplemobiletools.calendar.models.Event>() val events = ArrayList<Event>()
val token = object : TypeToken<List<GoogleEvent>>() {}.type val token = object : TypeToken<List<GoogleEvent>>() {}.type
val googleEvents = Gson().fromJson<ArrayList<GoogleEvent>>(json, token) ?: ArrayList<GoogleEvent>(8) val googleEvents = Gson().fromJson<ArrayList<GoogleEvent>>(json, token) ?: ArrayList<GoogleEvent>(8)
for (googleEvent in googleEvents) { for (googleEvent in googleEvents) {