arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-06-26 18:02:39 +00:00
Code Issues Releases Wiki Activity

Event invitation: use a random uid rather than the event uid when sharing.

Browse Source 
The reason for that, is that in some cases it stops working for certain
files, so using a different filename works around that issue.

I haven't managed to resolve that unfortunately.
This commit is contained in:
Tom Hacohen 2019-01-08 18:27:29 +00:00
parent 674165d3e7
commit 0e8dc1d266
1 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.kt
View File

@ -15,41 +15,26 @@ import android.content.SyncResult
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import at.bitfire.ical4android.CalendarStorageException
import com.etesync.syncadapter.AccountSettings import at.bitfire.ical4android.Event
import com.etesync.syncadapter.App import at.bitfire.ical4android.InvalidCalendarException
import com.etesync.syncadapter.Constants import at.bitfire.vcard4android.ContactsStorageException
import com.etesync.syncadapter.NotificationHelper import com.etesync.syncadapter.*
import com.etesync.syncadapter.R
import com.etesync.syncadapter.journalmanager.Exceptions import com.etesync.syncadapter.journalmanager.Exceptions
import com.etesync.syncadapter.journalmanager.JournalEntryManager import com.etesync.syncadapter.journalmanager.JournalEntryManager
import com.etesync.syncadapter.model.CollectionInfo import com.etesync.syncadapter.model.CollectionInfo
import com.etesync.syncadapter.model.SyncEntry import com.etesync.syncadapter.model.SyncEntry
import com.etesync.syncadapter.resource.LocalCalendar import com.etesync.syncadapter.resource.LocalCalendar
import com.etesync.syncadapter.resource.LocalEvent import com.etesync.syncadapter.resource.LocalEvent
import com.etesync.syncadapter.resource.LocalResource
import net.fortuna.ical4j.model.property.Attendee import net.fortuna.ical4j.model.property.Attendee
import okhttp3.HttpUrl
import org.acra.attachment.AcraContentProvider import org.acra.attachment.AcraContentProvider
import org.acra.util.IOUtils import org.acra.util.IOUtils
import org.apache.commons.codec.Charsets
import java.io.ByteArrayInputStream
import java.io.File import java.io.File
import java.io.IOException import java.io.IOException
import java.text.SimpleDateFormat
import java.util.ArrayList
import java.util.Calendar
import java.util.Locale
import java.util.TimeZone
import at.bitfire.ical4android.CalendarStorageException
import at.bitfire.ical4android.Event
import at.bitfire.ical4android.InvalidCalendarException
import at.bitfire.vcard4android.ContactsStorageException
import okhttp3.HttpUrl
import java.io.StringReader import java.io.StringReader
import java.text.SimpleDateFormat
import java.util.*
/** /**
* *
@ -160,7 +145,7 @@ constructor(context: Context, account: Account, settings: AccountSettings, extra
formatEventDates(event), formatEventDates(event),
if (event.location != null) event.location else "", if (event.location != null) event.location else "",
formatAttendees(event.attendees))) formatAttendees(event.attendees)))
val uri = createAttachmentFromString(context, event.uid!!, icsContent) val uri = createAttachmentFromString(context, icsContent)
if (uri == null) { if (uri == null) {
App.log.severe("Unable to create attachment from calendar event") App.log.severe("Unable to create attachment from calendar event")
return return
@ -246,7 +231,8 @@ constructor(context: Context, account: Account, settings: AccountSettings, extra
String.format("%s - %s (%s)", longDateFormat.format(startDate), longDateFormat.format(endDate), tzName) String.format("%s - %s (%s)", longDateFormat.format(startDate), longDateFormat.format(endDate), tzName)
} }
private fun createAttachmentFromString(context: Context, name: String, content: String): Uri? { private fun createAttachmentFromString(context: Context, content: String): Uri? {
val name = UUID.randomUUID().toString()
val parentDir = File(context.cacheDir, name) val parentDir = File(context.cacheDir, name)
parentDir.mkdirs() parentDir.mkdirs()
val cache = File(parentDir, "invite.ics") val cache = File(parentDir, "invite.ics")