From 446453d90762932df9af1ad318c56ddae0fce7d0 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 26 Nov 2016 11:38:06 +0100
Subject: [PATCH] add the actual vibration, disabled by default

---
 app/src/main/AndroidManifest.xml                    |  1 +
 .../simplemobiletools/calendar/helpers/Config.kt    |  2 +-
 .../calendar/receivers/NotificationReceiver.kt      | 13 +++++++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c7b4abd55..9f7906596 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
     package="com.simplemobiletools.calendar">
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
 
     <application
         android:name=".App"
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt
index 9a5437bc1..eb511dea5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt
@@ -35,7 +35,7 @@ class Config(context: Context) {
         set(displayWeekNumbers) = mPrefs.edit().putBoolean(WEEK_NUMBERS, displayWeekNumbers).apply()
 
     var vibrateOnReminder: Boolean
-        get() = mPrefs.getBoolean(VIBRATE, true)
+        get() = mPrefs.getBoolean(VIBRATE, false)
         set(vibrate) = mPrefs.edit().putBoolean(VIBRATE, vibrate).apply()
 
     var storedView: Int
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/receivers/NotificationReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/receivers/NotificationReceiver.kt
index 9e9a0803b..4a6eb1e00 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/receivers/NotificationReceiver.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/receivers/NotificationReceiver.kt
@@ -10,6 +10,7 @@ import android.media.RingtoneManager
 import com.simplemobiletools.calendar.R
 import com.simplemobiletools.calendar.activities.EventActivity
 import com.simplemobiletools.calendar.extensions.scheduleNextEvent
+import com.simplemobiletools.calendar.helpers.Config
 import com.simplemobiletools.calendar.helpers.DBHelper
 import com.simplemobiletools.calendar.helpers.EVENT_ID
 import com.simplemobiletools.calendar.helpers.Formatter
@@ -30,14 +31,14 @@ class NotificationReceiver : BroadcastReceiver() {
         val startTime = Formatter.getTime(event.startTS)
         val endTime = Formatter.getTime(event.endTS)
         val title = event.title
-        val notification = getNotification(context, pendingIntent, getEventTime(startTime, endTime) + " " + title)
+        val notification = getNotification(context, pendingIntent, "${getEventTime(startTime, endTime)} $title")
         notificationManager.notify(id, notification)
 
         if (event.repeatInterval != 0)
             context.scheduleNextEvent(event)
     }
 
-    private fun getEventTime(startTime: String, endTime: String) = if (startTime == endTime) startTime else ("$startTime - $endTime")
+    private fun getEventTime(startTime: String, endTime: String) = if (startTime == endTime) startTime else "$startTime - $endTime"
 
     private fun getPendingIntent(context: Context, event: Event): PendingIntent {
         val intent = Intent(context, EventActivity::class.java)
@@ -47,7 +48,7 @@ class NotificationReceiver : BroadcastReceiver() {
 
     private fun getNotification(context: Context, pendingIntent: PendingIntent, content: String): Notification {
         val soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
-        return Notification.Builder(context)
+        val builder = Notification.Builder(context)
                 .setContentTitle(context.resources.getString(R.string.app_name))
                 .setContentText(content)
                 .setSmallIcon(R.mipmap.calendar)
@@ -55,6 +56,10 @@ class NotificationReceiver : BroadcastReceiver() {
                 .setDefaults(Notification.DEFAULT_LIGHTS)
                 .setAutoCancel(true)
                 .setSound(soundUri)
-                .build()
+
+        if (Config.newInstance(context).vibrateOnReminder)
+            builder.setVibrate(longArrayOf(0, 500))
+
+        return builder.build()
     }
 }