fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

avoid exposing file uri at notifications

Browse Source
This commit is contained in:
tibbi
2018-01-27 14:39:55 +01:00
parent 40e2bcc00a
commit 8e838a295c
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
View File

@ -248,6 +248,7 @@ class SettingsActivity : SimpleActivity() {
} else { } else {
settings_reminder_sound.text = RingtoneManager.getRingtone(this, Uri.parse(config.reminderSound))?.getTitle(this) ?: noRingtone settings_reminder_sound.text = RingtoneManager.getRingtone(this, Uri.parse(config.reminderSound))?.getTitle(this) ?: noRingtone
} }
settings_reminder_sound_holder.setOnClickListener { settings_reminder_sound_holder.setOnClickListener {
Intent(RingtoneManager.ACTION_RINGTONE_PICKER).apply { Intent(RingtoneManager.ACTION_RINGTONE_PICKER).apply {
putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_NOTIFICATION) putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_NOTIFICATION)

11
app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
View File

@ -19,6 +19,7 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import com.simplemobiletools.calendar.BuildConfig
import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.activities.EventActivity import com.simplemobiletools.calendar.activities.EventActivity
import com.simplemobiletools.calendar.activities.SimpleActivity import com.simplemobiletools.calendar.activities.SimpleActivity
@ -31,6 +32,7 @@ import com.simplemobiletools.calendar.services.SnoozeService
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import org.joda.time.DateTime import org.joda.time.DateTime
import org.joda.time.DateTimeZone import org.joda.time.DateTimeZone
import java.io.File
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
@ -95,8 +97,9 @@ fun Context.scheduleNextEventReminder(event: Event?, dbHelper: DBHelper) {
} }
fun Context.scheduleEventIn(notifTS: Long, event: Event) { fun Context.scheduleEventIn(notifTS: Long, event: Event) {
if (notifTS < System.currentTimeMillis()) if (notifTS < System.currentTimeMillis()) {
return return
}
val pendingIntent = getNotificationIntent(applicationContext, event) val pendingIntent = getNotificationIntent(applicationContext, event)
val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager
@ -194,7 +197,11 @@ private fun getNotification(context: Context, pendingIntent: PendingIntent, even
} }
} }
val soundUri = Uri.parse(context.config.reminderSound) var soundUri = Uri.parse(context.config.reminderSound)
if (soundUri.scheme == "file") {
soundUri = context.getFilePublicUri(File(soundUri.path), BuildConfig.APPLICATION_ID)
}
val builder = NotificationCompat.Builder(context) val builder = NotificationCompat.Builder(context)
.setContentTitle(event.title) .setContentTitle(event.title)
.setContentText(content) .setContentText(content)

6
app/src/main/kotlin/com/simplemobiletools/calendar/receivers/NotificationReceiver.kt
View File

@ -19,12 +19,14 @@ class NotificationReceiver : BroadcastReceiver() {
context.updateListWidget() context.updateListWidget()
val id = intent.getIntExtra(EVENT_ID, -1) val id = intent.getIntExtra(EVENT_ID, -1)
if (id == -1) if (id == -1) {
return return
}
val event = context.dbHelper.getEventWithId(id) val event = context.dbHelper.getEventWithId(id)
if (event == null || event.getReminders().isEmpty()) if (event == null || event.getReminders().isEmpty()) {
return return
}
if (!event.ignoreEventOccurrences.contains(Formatter.getDayCodeFromTS(event.startTS).toInt())) { if (!event.ignoreEventOccurrences.contains(Formatter.getDayCodeFromTS(event.startTS).toInt())) {
context.notifyEvent(event) context.notifyEvent(event)