Skip to content

Commit 2391b9e

Browse files
naveensinghnaveensingh
committed
chore: remove outdated in-app vibration option
See: #689
1 parent 3cafbd9 commit 2391b9e

5 files changed

Lines changed: 28 additions & 162 deletions

File tree

‎app/src/main/kotlin/org/fossify/calendar/activities/SettingsActivity.kt‎

Lines changed: 3 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import java.util.Locale
3232
import kotlin.system.exitProcess
3333

3434
class SettingsActivity : SimpleActivity() {
35-
private val GET_RINGTONE_URI = 1
3635
private val PICK_SETTINGS_IMPORT_SOURCE_INTENT = 2
3736
private val PICK_EVENTS_IMPORT_SOURCE_INTENT = 3
3837
private val PICK_EVENTS_EXPORT_FILE_INTENT = 4
@@ -80,8 +79,6 @@ class SettingsActivity : SimpleActivity() {
8079
setupMidnightSpanEvents()
8180
setupAllowCustomizeDayCount()
8281
setupStartWeekWithCurrentDay()
83-
setupVibrate()
84-
setupReminderSound()
8582
setupReminderAudioStream()
8683
setupUseSameSnooze()
8784
setupLoopReminders()
@@ -146,15 +143,12 @@ class SettingsActivity : SimpleActivity() {
146143

147144
override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
148145
super.onActivityResult(requestCode, resultCode, resultData)
149-
if (requestCode == GET_RINGTONE_URI && resultCode == RESULT_OK && resultData != null) {
150-
val newAlarmSound = storeNewYourAlarmSound(resultData)
151-
updateReminderSound(newAlarmSound)
152-
} else if (requestCode == PICK_SETTINGS_IMPORT_SOURCE_INTENT && resultCode == Activity.RESULT_OK && resultData != null && resultData.data != null) {
146+
if (requestCode == PICK_SETTINGS_IMPORT_SOURCE_INTENT && resultCode == RESULT_OK && resultData != null && resultData.data != null) {
153147
val inputStream = contentResolver.openInputStream(resultData.data!!)
154148
parseFile(inputStream)
155-
} else if (requestCode == PICK_EVENTS_IMPORT_SOURCE_INTENT && resultCode == Activity.RESULT_OK && resultData != null && resultData.data != null) {
149+
} else if (requestCode == PICK_EVENTS_IMPORT_SOURCE_INTENT && resultCode == RESULT_OK && resultData != null && resultData.data != null) {
156150
tryImportEventsFromFile(resultData.data!!)
157-
} else if (requestCode == PICK_EVENTS_EXPORT_FILE_INTENT && resultCode == Activity.RESULT_OK && resultData != null && resultData.data != null) {
151+
} else if (requestCode == PICK_EVENTS_EXPORT_FILE_INTENT && resultCode == RESULT_OK && resultData != null && resultData.data != null) {
158152
val outputStream = contentResolver.openOutputStream(resultData.data!!)
159153
exportEventsTo(eventTypesToExport, outputStream)
160154
}
@@ -477,40 +471,6 @@ class SettingsActivity : SimpleActivity() {
477471
}
478472
}
479473

480-
@Deprecated("Not used on Oreo+ devices")
481-
private fun setupReminderSound() = binding.apply {
482-
settingsReminderSoundHolder.beGoneIf(isOreoPlus())
483-
settingsReminderSound.text = config.reminderSoundTitle
484-
485-
settingsReminderSoundHolder.setOnClickListener {
486-
SelectAlarmSoundDialog(
487-
this@SettingsActivity,
488-
config.reminderSoundUri,
489-
config.reminderAudioStream,
490-
GET_RINGTONE_URI,
491-
RingtoneManager.TYPE_NOTIFICATION,
492-
false,
493-
onAlarmPicked = {
494-
if (it != null) {
495-
updateReminderSound(it)
496-
}
497-
},
498-
onAlarmSoundDeleted = {
499-
if (it.uri == config.reminderSoundUri) {
500-
val defaultAlarm = getDefaultAlarmSound(RingtoneManager.TYPE_NOTIFICATION)
501-
updateReminderSound(defaultAlarm)
502-
}
503-
})
504-
}
505-
}
506-
507-
@Deprecated("Not used on Oreo+ devices")
508-
private fun updateReminderSound(alarmSound: AlarmSound) {
509-
config.reminderSoundTitle = alarmSound.title
510-
config.reminderSoundUri = alarmSound.uri
511-
binding.settingsReminderSound.text = alarmSound.title
512-
}
513-
514474
private fun setupReminderAudioStream() = binding.apply {
515475
settingsReminderAudioStream.text = getAudioStreamText()
516476
settingsReminderAudioStreamHolder.setOnClickListener {
@@ -537,14 +497,6 @@ class SettingsActivity : SimpleActivity() {
537497
}
538498
)
539499

540-
private fun setupVibrate() = binding.apply {
541-
settingsVibrate.isChecked = config.vibrateOnReminder
542-
settingsVibrateHolder.setOnClickListener {
543-
settingsVibrate.toggle()
544-
config.vibrateOnReminder = settingsVibrate.isChecked
545-
}
546-
}
547-
548500
private fun setupLoopReminders() = binding.apply {
549501
settingsLoopReminders.isChecked = config.loopReminders
550502
settingsLoopRemindersHolder.setOnClickListener {
@@ -940,7 +892,6 @@ class SettingsActivity : SimpleActivity() {
940892
put(SHOW_MIDNIGHT_SPANNING_EVENTS_AT_TOP, config.showMidnightSpanningEventsAtTop)
941893
put(ALLOW_CUSTOMIZE_DAY_COUNT, config.allowCustomizeDayCount)
942894
put(START_WEEK_WITH_CURRENT_DAY, config.startWeekWithCurrentDay)
943-
put(VIBRATE, config.vibrateOnReminder)
944895
put(LAST_EVENT_REMINDER_MINUTES, config.lastEventReminderMinutes1)
945896
put(LAST_EVENT_REMINDER_MINUTES_2, config.lastEventReminderMinutes2)
946897
put(LAST_EVENT_REMINDER_MINUTES_3, config.lastEventReminderMinutes3)
@@ -1050,7 +1001,6 @@ class SettingsActivity : SimpleActivity() {
10501001
SHOW_MIDNIGHT_SPANNING_EVENTS_AT_TOP -> config.showMidnightSpanningEventsAtTop = value.toBoolean()
10511002
ALLOW_CUSTOMIZE_DAY_COUNT -> config.allowCustomizeDayCount = value.toBoolean()
10521003
START_WEEK_WITH_CURRENT_DAY -> config.startWeekWithCurrentDay = value.toBoolean()
1053-
VIBRATE -> config.vibrateOnReminder = value.toBoolean()
10541004
LAST_EVENT_REMINDER_MINUTES -> config.lastEventReminderMinutes1 = value.toInt()
10551005
LAST_EVENT_REMINDER_MINUTES_2 -> config.lastEventReminderMinutes2 = value.toInt()
10561006
LAST_EVENT_REMINDER_MINUTES_3 -> config.lastEventReminderMinutes3 = value.toInt()

‎app/src/main/kotlin/org/fossify/calendar/extensions/Context.kt‎

Lines changed: 20 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.fossify.calendar.extensions
22

33
import android.accounts.Account
4-
import android.annotation.SuppressLint
54
import android.app.AlarmManager
65
import android.app.Notification
76
import android.app.NotificationChannel
@@ -19,14 +18,14 @@ import android.graphics.Bitmap
1918
import android.media.AudioAttributes
2019
import android.media.AudioManager
2120
import android.media.MediaScannerConnection
21+
import android.media.RingtoneManager
2222
import android.net.Uri
2323
import android.os.Bundle
2424
import android.provider.CalendarContract
2525
import android.view.LayoutInflater
2626
import android.view.ViewGroup
2727
import android.widget.LinearLayout
2828
import androidx.core.app.NotificationCompat
29-
import androidx.core.net.toUri
3029
import androidx.print.PrintHelper
3130
import org.fossify.calendar.R
3231
import org.fossify.calendar.activities.EventActivity
@@ -94,7 +93,6 @@ import org.fossify.commons.extensions.formatSecondsToTimeString
9493
import org.fossify.commons.extensions.getContrastColor
9594
import org.fossify.commons.extensions.getDoesFilePathExist
9695
import org.fossify.commons.extensions.getMimeType
97-
import org.fossify.commons.extensions.grantReadUriPermission
9896
import org.fossify.commons.extensions.hasProperStoredFirstParentUri
9997
import org.fossify.commons.extensions.removeBit
10098
import org.fossify.commons.extensions.showErrorToast
@@ -105,15 +103,13 @@ import org.fossify.commons.helpers.FONT_SIZE_SMALL
105103
import org.fossify.commons.helpers.FRIDAY_BIT
106104
import org.fossify.commons.helpers.MONDAY_BIT
107105
import org.fossify.commons.helpers.SATURDAY_BIT
108-
import org.fossify.commons.helpers.SILENT
109106
import org.fossify.commons.helpers.SUNDAY_BIT
110107
import org.fossify.commons.helpers.THURSDAY_BIT
111108
import org.fossify.commons.helpers.TUESDAY_BIT
112109
import org.fossify.commons.helpers.WEDNESDAY_BIT
113110
import org.fossify.commons.helpers.WEEK_SECONDS
114111
import org.fossify.commons.helpers.YEAR_SECONDS
115112
import org.fossify.commons.helpers.ensureBackgroundThread
116-
import org.fossify.commons.helpers.isOreoPlus
117113
import org.fossify.commons.helpers.isRPlus
118114
import org.fossify.commons.helpers.isSPlus
119115
import org.joda.time.DateTime
@@ -441,31 +437,26 @@ fun Context.getUsageAttributeForStreamType(): Int {
441437
}
442438
}
443439

444-
@SuppressLint("NewApi")
445440
fun Context.getNotification(pendingIntent: PendingIntent, event: Event, content: String, publicVersion: Boolean = false): Notification? {
446-
var soundUri = config.reminderSoundUri
447-
if (soundUri == SILENT) {
448-
soundUri = ""
449-
} else {
450-
grantReadUriPermission(soundUri)
451-
}
452-
453441
val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
454-
// create a new channel for every new sound uri as the new Android Oreo notification system is fundamentally broken
455-
if (soundUri != config.lastSoundUri || config.lastVibrateOnReminder != config.vibrateOnReminder) {
456-
if (!publicVersion) {
457-
if (isOreoPlus()) {
458-
val oldChannelId = "simple_calendar_${config.lastReminderChannel}_${config.reminderAudioStream}_${event.eventType}"
459-
notificationManager.deleteNotificationChannel(oldChannelId)
460-
}
461-
}
462-
463-
config.lastVibrateOnReminder = config.vibrateOnReminder
464-
config.lastReminderChannel = System.currentTimeMillis()
465-
config.lastSoundUri = soundUri
466-
}
467-
468-
val channelId = "simple_calendar_${config.lastReminderChannel}_${config.reminderAudioStream}_${event.eventType}"
442+
// TODO: Properly migrate old notification channels to avoid nuking user customization
443+
// use legacy channels for existing users, new stable channels for fresh installs
444+
val newChannelId = "simple_calendar_${config.reminderAudioStream}_${event.eventType}"
445+
val legacyChannelId = if (!config.notificationChannelsMigrated) {
446+
val existingChannels = notificationManager.notificationChannels
447+
existingChannels.find { channel ->
448+
channel.id.startsWith("simple_calendar_") &&
449+
channel.id.endsWith("_${config.reminderAudioStream}_${event.eventType}") &&
450+
channel.id != newChannelId
451+
}?.id
452+
} else null
453+
454+
val channelId = legacyChannelId ?: newChannelId
455+
if (!config.notificationChannelsMigrated) {
456+
config.notificationChannelsMigrated = true
457+
}
458+
459+
val soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
469460
val audioAttributes = AudioAttributes.Builder()
470461
.setUsage(getUsageAttributeForStreamType())
471462
.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
@@ -477,8 +468,7 @@ fun Context.getNotification(pendingIntent: PendingIntent, event: Event, content:
477468
setBypassDnd(true)
478469
enableLights(true)
479470
lightColor = event.color
480-
enableVibration(config.vibrateOnReminder)
481-
setSound(soundUri.toUri(), audioAttributes)
471+
setSound(soundUri, audioAttributes)
482472
try {
483473
notificationManager.createNotificationChannel(this)
484474
} catch (e: Exception) {
@@ -512,11 +502,6 @@ fun Context.getNotification(pendingIntent: PendingIntent, event: Event, content:
512502
)
513503
}
514504

515-
if (config.vibrateOnReminder) {
516-
val vibrateArray = LongArray(2) { 500 }
517-
builder.setVibrate(vibrateArray)
518-
}
519-
520505
if (!publicVersion) {
521506
val notification = getNotification(pendingIntent, event, content, true)
522507
if (notification != null) {

‎app/src/main/kotlin/org/fossify/calendar/helpers/Config.kt‎

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@ package org.fossify.calendar.helpers
22

33
import android.content.Context
44
import android.media.AudioManager
5-
import android.media.RingtoneManager
65
import org.fossify.calendar.R
7-
import org.fossify.calendar.extensions.config
86
import org.fossify.calendar.extensions.scheduleCalDAVSync
9-
import org.fossify.commons.extensions.getDefaultAlarmTitle
107
import org.fossify.commons.helpers.BaseConfig
118
import org.fossify.commons.helpers.DAY_MINUTES
129
import org.fossify.commons.helpers.YEAR_SECONDS
@@ -37,29 +34,6 @@ class Config(context: Context) : BaseConfig(context) {
3734
get() = prefs.getBoolean(ALLOW_CUSTOMIZE_DAY_COUNT, true)
3835
set(allow) = prefs.edit().putBoolean(ALLOW_CUSTOMIZE_DAY_COUNT, allow).apply()
3936

40-
var vibrateOnReminder: Boolean
41-
get() = prefs.getBoolean(VIBRATE, false)
42-
set(vibrate) = prefs.edit().putBoolean(VIBRATE, vibrate).apply()
43-
44-
@Deprecated("Not used on Oreo+ devices")
45-
var reminderSoundUri: String
46-
get() = prefs.getString(REMINDER_SOUND_URI, RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION).toString())!!
47-
set(reminderSoundUri) = prefs.edit().putString(REMINDER_SOUND_URI, reminderSoundUri).apply()
48-
49-
@Deprecated("Not used on Oreo+ devices")
50-
var reminderSoundTitle: String
51-
get() = prefs.getString(REMINDER_SOUND_TITLE, context.getDefaultAlarmTitle(RingtoneManager.TYPE_NOTIFICATION))!!
52-
set(reminderSoundTitle) = prefs.edit().putString(REMINDER_SOUND_TITLE, reminderSoundTitle).apply()
53-
54-
@Deprecated("Not used on Oreo+ devices")
55-
var lastSoundUri: String
56-
get() = prefs.getString(LAST_SOUND_URI, "")!!
57-
set(lastSoundUri) = prefs.edit().putString(LAST_SOUND_URI, lastSoundUri).apply()
58-
59-
var lastReminderChannel: Long
60-
get() = prefs.getLong(LAST_REMINDER_CHANNEL_ID, 0L)
61-
set(lastReminderChannel) = prefs.edit().putLong(LAST_REMINDER_CHANNEL_ID, lastReminderChannel).apply()
62-
6337
var storedView: Int
6438
get() = prefs.getInt(VIEW, MONTHLY_VIEW)
6539
set(view) = prefs.edit().putInt(VIEW, view).apply()
@@ -190,10 +164,6 @@ class Config(context: Context) : BaseConfig(context) {
190164
get() = prefs.getBoolean(PULL_TO_REFRESH, false)
191165
set(pullToRefresh) = prefs.edit().putBoolean(PULL_TO_REFRESH, pullToRefresh).apply()
192166

193-
var lastVibrateOnReminder: Boolean
194-
get() = prefs.getBoolean(LAST_VIBRATE_ON_REMINDER, context.config.vibrateOnReminder)
195-
set(lastVibrateOnReminder) = prefs.edit().putBoolean(LAST_VIBRATE_ON_REMINDER, lastVibrateOnReminder).apply()
196-
197167
var defaultStartTime: Int
198168
get() = prefs.getInt(DEFAULT_START_TIME, DEFAULT_START_TIME_NEXT_FULL_HOUR)
199169
set(defaultStartTime) = prefs.edit().putInt(DEFAULT_START_TIME, defaultStartTime).apply()
@@ -266,6 +236,10 @@ class Config(context: Context) : BaseConfig(context) {
266236
get() = prefs.getBoolean(WAS_FILTERED_OUT_WARNING_SHOWN, false)
267237
set(wasFilteredOutWarningShown) = prefs.edit().putBoolean(WAS_FILTERED_OUT_WARNING_SHOWN, wasFilteredOutWarningShown).apply()
268238

239+
var notificationChannelsMigrated: Boolean
240+
get() = prefs.getBoolean(NOTIFICATION_CHANNELS_MIGRATED, false)
241+
set(notificationChannelsMigrated) = prefs.edit().putBoolean(NOTIFICATION_CHANNELS_MIGRATED, notificationChannelsMigrated).apply()
242+
269243
var autoBackupEventTypes: Set<String>
270244
get() = prefs.getStringSet(AUTO_BACKUP_EVENT_TYPES, HashSet())!!
271245
set(autoBackupEventTypes) = prefs.edit().remove(AUTO_BACKUP_EVENT_TYPES).putStringSet(AUTO_BACKUP_EVENT_TYPES, autoBackupEventTypes).apply()

‎app/src/main/kotlin/org/fossify/calendar/helpers/Constants.kt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,6 @@ const val START_WEEKLY_AT = "start_weekly_at"
8989
const val START_WEEK_WITH_CURRENT_DAY = "start_week_with_current_day"
9090
const val SHOW_MIDNIGHT_SPANNING_EVENTS_AT_TOP = "show_midnight_spanning_events_at_top"
9191
const val ALLOW_CUSTOMIZE_DAY_COUNT = "allow_customise_day_count"
92-
const val VIBRATE = "vibrate"
93-
const val REMINDER_SOUND_URI = "reminder_sound_uri"
94-
const val REMINDER_SOUND_TITLE = "reminder_sound_title"
9592
const val VIEW = "view"
9693
const val LAST_EVENT_REMINDER_MINUTES = "reminder_minutes"
9794
const val LAST_EVENT_REMINDER_MINUTES_2 = "reminder_minutes_2"
@@ -111,15 +108,12 @@ const val SHOW_GRID = "show_grid"
111108
const val LOOP_REMINDERS = "loop_reminders"
112109
const val DIM_PAST_EVENTS = "dim_past_events"
113110
const val DIM_COMPLETED_TASKS = "dim_completed_tasks"
114-
const val LAST_SOUND_URI = "last_sound_uri"
115-
const val LAST_REMINDER_CHANNEL_ID = "last_reminder_channel_ID"
116111
const val REMINDER_AUDIO_STREAM = "reminder_audio_stream"
117112
const val USE_PREVIOUS_EVENT_REMINDERS = "use_previous_event_reminders"
118113
const val DEFAULT_REMINDER_1 = "default_reminder_1"
119114
const val DEFAULT_REMINDER_2 = "default_reminder_2"
120115
const val DEFAULT_REMINDER_3 = "default_reminder_3"
121116
const val PULL_TO_REFRESH = "pull_to_refresh"
122-
const val LAST_VIBRATE_ON_REMINDER = "last_vibrate_on_reminder"
123117
const val DEFAULT_START_TIME = "default_start_time"
124118
const val DEFAULT_DURATION = "default_duration"
125119
const val DEFAULT_EVENT_TYPE_ID = "default_event_type_id"
@@ -139,6 +133,7 @@ const val HIGHLIGHT_WEEKENDS_COLOR = "highlight_weekends_color"
139133
const val LAST_USED_EVENT_SPAN = "last_used_event_span"
140134
const val ALLOW_CREATING_TASKS = "allow_creating_tasks"
141135
const val WAS_FILTERED_OUT_WARNING_SHOWN = "was_filtered_out_warning_shown"
136+
const val NOTIFICATION_CHANNELS_MIGRATED = "notification_channels_migrated"
142137
const val AUTO_BACKUP = "auto_backup"
143138
const val AUTO_BACKUP_FOLDER = "auto_backup_folder"
144139
const val AUTO_BACKUP_FILENAME = "auto_backup_filename"

‎app/src/main/res/layout/activity_settings.xml‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -253,29 +253,6 @@
253253

254254
</RelativeLayout>
255255

256-
<RelativeLayout
257-
android:id="@+id/settings_reminder_sound_holder"
258-
style="@style/SettingsHolderTextViewStyle"
259-
android:layout_width="match_parent"
260-
android:layout_height="wrap_content">
261-
262-
<org.fossify.commons.views.MyTextView
263-
android:id="@+id/settings_reminder_sound_label"
264-
style="@style/SettingsTextLabelStyle"
265-
android:layout_width="wrap_content"
266-
android:layout_height="wrap_content"
267-
android:text="@string/reminder_sound" />
268-
269-
<org.fossify.commons.views.MyTextView
270-
android:id="@+id/settings_reminder_sound"
271-
style="@style/SettingsTextValueStyle"
272-
android:layout_width="match_parent"
273-
android:layout_height="wrap_content"
274-
android:layout_below="@+id/settings_reminder_sound_label"
275-
tools:text="Default" />
276-
277-
</RelativeLayout>
278-
279256
<RelativeLayout
280257
android:id="@+id/settings_reminder_audio_stream_holder"
281258
style="@style/SettingsHolderTextViewStyle"
@@ -299,21 +276,6 @@
299276

300277
</RelativeLayout>
301278

302-
<RelativeLayout
303-
android:id="@+id/settings_vibrate_holder"
304-
style="@style/SettingsHolderSwitchStyle"
305-
android:layout_width="match_parent"
306-
android:layout_height="wrap_content">
307-
308-
<org.fossify.commons.views.MyMaterialSwitch
309-
android:id="@+id/settings_vibrate"
310-
style="@style/SettingsSwitchStyle"
311-
android:layout_width="match_parent"
312-
android:layout_height="wrap_content"
313-
android:text="@string/vibrate" />
314-
315-
</RelativeLayout>
316-
317279
<RelativeLayout
318280
android:id="@+id/settings_loop_reminders_holder"
319281
style="@style/SettingsHolderSwitchStyle"

0 commit comments

Comments
 (0)