From 77eeb1aba730b7595655101c5274c869ba8944d5 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 28 Jul 2017 21:59:21 +0200
Subject: [PATCH] properly import events without title

---
 .../calendar/asynctasks/FetchGoogleEventsTask.kt              | 4 +++-
 .../com/simplemobiletools/calendar/models/GoogleEvent.kt      | 2 +-
 app/src/main/res/values-de/strings.xml                        | 1 +
 app/src/main/res/values-es/strings.xml                        | 1 +
 app/src/main/res/values-fr/strings.xml                        | 1 +
 app/src/main/res/values-hi-rIN/strings.xml                    | 1 +
 app/src/main/res/values-hu/strings.xml                        | 1 +
 app/src/main/res/values-it/strings.xml                        | 1 +
 app/src/main/res/values-iw/strings.xml                        | 1 +
 app/src/main/res/values-ja/strings.xml                        | 1 +
 app/src/main/res/values-pt-rBR/strings.xml                    | 1 +
 app/src/main/res/values-pt/strings.xml                        | 1 +
 app/src/main/res/values-ru/strings.xml                        | 1 +
 app/src/main/res/values-sk/strings.xml                        | 3 ++-
 app/src/main/res/values-sv/strings.xml                        | 1 +
 app/src/main/res/values-tr/strings.xml                        | 1 +
 app/src/main/res/values/strings.xml                           | 1 +
 17 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/asynctasks/FetchGoogleEventsTask.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/asynctasks/FetchGoogleEventsTask.kt
index 88cfc6569..6450e15b2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/asynctasks/FetchGoogleEventsTask.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/asynctasks/FetchGoogleEventsTask.kt
@@ -30,6 +30,7 @@ class FetchGoogleEventsTask(val context: Context, val googleSyncListener: Google
     private var eventColors = SparseIntArray()
     private var service = context.getGoogleSyncService()
     private var parseError: Exception? = null
+    private var noTitleText = context.getString(R.string.no_title)
 
     override fun doInBackground(vararg params: Void): String {
         if (!context.isGoogleSyncActive() || !context.isOnline())
@@ -149,11 +150,12 @@ class FetchGoogleEventsTask(val context: Context, val googleSyncListener: Google
                 endTS = DateTime(end.dateTime).seconds()
             }
 
+            val summary = googleEvent.summary ?: "($noTitleText)"
             val description = googleEvent.description ?: ""
             val reminders = getReminders(googleEvent.reminders)
             val repeatRule = getRepeatRule(googleEvent, startTS)
             val eventTypeId = getEventTypeId(googleEvent.colorId)
-            val event = Event(eventId, startTS, endTS, googleEvent.summary, description, reminders.getOrElse(0, { -1 }),
+            val event = Event(eventId, startTS, endTS, summary, description, reminders.getOrElse(0, { -1 }),
                     reminders.getOrElse(1, { -1 }), reminders.getOrElse(2, { -1 }), repeatRule.repeatInterval, importId, flags, repeatRule.repeatLimit,
                     repeatRule.repeatRule, eventTypeId, lastUpdated = lastUpdate, source = SOURCE_GOOGLE_SYNC)
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/models/GoogleEvent.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/models/GoogleEvent.kt
index 7a2fe13aa..194eb7950 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/models/GoogleEvent.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/models/GoogleEvent.kt
@@ -3,5 +3,5 @@ package com.simplemobiletools.calendar.models
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 
-data class GoogleEvent(val summary: String, val description: String?, val status: String, val start: GoogleEventDateTime, val end: GoogleEventDateTime,
+data class GoogleEvent(val summary: String?, val description: String?, val status: String, val start: GoogleEventDateTime, val end: GoogleEventDateTime,
                        val reminders: JsonObject, val recurrence: JsonArray?, val id: String, val colorId: Int, val updated: String)
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 67566c803..cc2833814 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -142,6 +142,7 @@
     <string name="export_past_events_too">vergagene Termine auch exportieren</string>
     <string name="include_event_types">Include event types</string>
     <string name="filename_without_ics">Filename (without .ics)</string>
+    <string name="no_title">No title</string>
 
     <!-- Event details -->
     <string name="title">Titel</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f4ffd6dbb..6a508e3a1 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -142,6 +142,7 @@
     <string name="export_past_events_too">También exportar eventos pasados</string>
     <string name="include_event_types">Include event types</string>
     <string name="filename_without_ics">Filename (without .ics)</string>
+    <string name="no_title">No title</string>
 
     <!-- Event details -->
     <string name="title">Título</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d95594757..a0d2c63cc 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -142,6 +142,7 @@
     <string name="export_past_events_too">Export past events too</string>
     <string name="include_event_types">Include event types</string>
     <string name="filename_without_ics">Filename (without .ics)</string>
+    <string name="no_title">No title</string>
 
     <!-- Event details -->
     <string name="title">Titre</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index f345857f2..456e837df 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -142,6 +142,7 @@
     <string name="export_past_events_too">Export past events too</string>
     <string name="include_event_types">Include event types</string>
     <string name="filename_without_ics">Filename (without .ics)</string>
+    <string name="no_title">No title</string>
 
     <!-- Event details -->
     <string name="title">शीर्षक</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 48033c818..f080a820a 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -142,6 +142,7 @@
     <string name="export_past_events_too">Export past events too</string>
     <string name="include_event_types">Include event types</string>
     <string name="filename_without_ics">Filename (without .ics)</string>
+    <string name="no_title">No title</string>
 
     <!-- Event details -->
     <string name="title">Név</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 1bfbbdad5..fc73f5d3c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -142,6 +142,7 @@
     <string name="export_past_events_too">Export past events too</string>
     <string name="include_event_types">Include event types</string>
     <string name="filename_without_ics">Filename (without .ics)</string>
+    <string name="no_title">No title</string>
 
     <!-- Event details -->
     <string name="title">Titolo</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 4f9ceb814..57b230c48 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -142,6 +142,7 @@
     <string name="export_past_events_too">Export past events too</string>
     <string name="include_event_types">Include event types</string>
     <string name="filename_without_ics">Filename (without .ics)</string>
+    <string name="no_title">No title</string>
 
     <!-- Event details -->
     <string name="title">כותרת</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 93861c6d3..fdd817ee5 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -142,6 +142,7 @@
     <string name="export_past_events_too">Export past events too</string>
     <string name="include_event_types">Include event types</string>
     <string name="filename_without_ics">Filename (without .ics)</string>
+    <string name="no_title">No title</string>
 
     <!-- Event details -->
     <string name="title">タイトル</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index eaf24a4e5..51ec98b5c 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -142,6 +142,7 @@
     <string name="export_past_events_too">Export past events too</string>
     <string name="include_event_types">Include event types</string>
     <string name="filename_without_ics">Filename (without .ics)</string>
+    <string name="no_title">No title</string>
 
     <!-- Event details -->
     <string name="title">Título</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index bee0851fa..52c18a102 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -142,6 +142,7 @@
     <string name="export_past_events_too">Exportar eventos antigos</string>
     <string name="include_event_types">Incluir tipos de eventos</string>
     <string name="filename_without_ics">Nome do ficheiro (sem .ics)</string>
+    <string name="no_title">No title</string>
 
     <!-- Event details -->
     <string name="title">Título</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 46542288c..d1e4288eb 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -156,6 +156,7 @@
     <string name="export_past_events_too">Экспортировать прошедшие события</string>
     <string name="include_event_types">Включать типы событий</string>
     <string name="filename_without_ics">Имя файла (без .ics)</string>
+    <string name="no_title">No title</string>
 
     <!-- Event details -->
     <string name="title">Заголовок</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 67407e314..e983ac9c5 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -97,7 +97,7 @@
 
     <plurals name="years">
         <item quantity="one">%1$d rok</item>
-        <item quantity="two">%1$d roky</item>
+        <item quantity="few">%1$d roky</item>
         <item quantity="other">%1$d rokov</item>
     </plurals>
 
@@ -149,6 +149,7 @@
     <string name="export_past_events_too">Exportovať aj minulé udalosti</string>
     <string name="include_event_types">Zahrnúť typy udalostí</string>
     <string name="filename_without_ics">Názov súboru (bez .ics)</string>
+    <string name="no_title">Bez názvu</string>
 
     <!-- Event details -->
     <string name="title">Názov</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 4f8398f73..b84f01789 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -142,6 +142,7 @@
     <string name="export_past_events_too">Exportera även tidigare händelser</string>
     <string name="include_event_types">Inkludera händelsetyper</string>
     <string name="filename_without_ics">Filnamn (utan .ics)</string>
+    <string name="no_title">No title</string>
 
     <!-- Event details -->
     <string name="title">Titel</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 4aea31424..a77512436 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -142,6 +142,7 @@
     <string name="export_past_events_too">Geçmişteki etkinlikleri de dışa aktar</string>
     <string name="include_event_types">Include event types</string>
     <string name="filename_without_ics">Filename (without .ics)</string>
+    <string name="no_title">No title</string>
 
     <!-- Event details -->
     <string name="title">Başlık</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6369e032a..891bd1885 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -142,6 +142,7 @@
     <string name="export_past_events_too">Export past events too</string>
     <string name="include_event_types">Include event types</string>
     <string name="filename_without_ics">Filename (without .ics)</string>
+    <string name="no_title">No title</string>
 
     <!-- Event details -->
     <string name="title">Title</string>