Merge branch 'release-2.5.10'

* release-2.5.10:
  Bump versionCode and versionName
  CI: simplify script and check for successful cache extraction
  Revert "CI: use api 28 image to avoid re-download of build-tools"
  Update Kotlin to 1.3.0 (#154)
  Add Notifications management settings (API 26+) (#156)
  RoutinesActivityCreate/Edit test: Solve autocorrect bug
  RoutinesActivityCreate/Edit tests: add error messages to asserts
  gitlab-ci: add generated DB file as an artifact (#153)
  Merge PR #149 + changes (#151)
  Merge PR #147 + changes (#152)
  InstallDatabaseService: only vibrate once for progress notification
  Use HH format instead of kk to display time (#148)
  Update CONTRIBUTING.md
  DBTest: Clean up exportation
  Features/export db (#140)

Author: AlvaroBrey

.gitignore

@@ -48,3 +48,4 @@ Calendula/keystore
 captures/
 
 hs_err_*.log
+generated/

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: circleci/android:api-28-alpha
+image: circleci/android:api-27-alpha
 
 before_script:
   - export GRADLE_USER_HOME="$(pwd)/.gradle"
@@ -8,12 +8,9 @@ cache:
   paths:
     - .gradle
 
-stages:
-  - build
-
 build:
-  stage: build
   script:
+    - du -hs .gradle/ || true
     - ./gradlew assembleCiDebug
     - ./gradlew testCiDebugUnitTest
     - ./gradlew jacocoTestReportCiDebug
@@ -25,4 +22,5 @@ build:
       - Calendula/build/reports/tests/
       - Calendula/build/test-results/
       - Calendula/build/reports/jacoco/
+      - generated/
     expire_in: 1 week

CONTRIBUTING.md

@@ -25,7 +25,7 @@ Driessen](http://nvie.com/about/) on [this article](http://nvie.com/posts/a-succ
  * The `develop` branch reflects the code of the latest delivered development changes for the next release.
  * Furthermore, when a development version (almost) reflects the desired state of the new release, a release branch is created. Release branches are usually deployed through the *Google Play BETA channel* before they are made available to everyone
 
-Create a topic branch from where you want to work. This may be usually the `master` or `release` branch for bug fixes or `develop` for adding new features. Please avoid working directly on the master branch.
+Create a topic branch from where you want to work. This may be usually the `master` or `release` branch for bug fixes or `develop` for adding new features. **Please avoid working directly on the `master` branch, and do not submits pull requests with `master` as a target.**
 
 ## I would like to contribute, but I'm not a developer...
 

Calendula/build.gradle

@@ -76,8 +76,8 @@ android {
     defaultConfig {
         minSdkVersion 18
         targetSdkVersion 26
-        versionCode 40
-        versionName "2.5.9"
+        versionCode 41
+        versionName "2.5.10"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         applicationId "es.usc.citius.servando.calendula"
         multiDexEnabled true

Calendula/src/androidTest/java/es/usc/citius/servando/calendula/activities/RoutinesActivityCreateTest.java

@@ -19,8 +19,12 @@
 package es.usc.citius.servando.calendula.activities;
 
 import android.support.test.InstrumentationRegistry;
+import android.support.test.espresso.assertion.ViewAssertions;
 import android.test.ActivityInstrumentationTestCase2;
+import android.view.View;
 
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
 import org.joda.time.LocalTime;
 import org.junit.Before;
 import org.junit.Test;
@@ -42,7 +46,7 @@
 
 public class RoutinesActivityCreateTest extends ActivityInstrumentationTestCase2<RoutinesActivity> {
 
-    public static final String NAME = "breakfast";
+    private static final String NAME = "Breakfast";
 
     private RoutinesActivity mActivity;
 
@@ -93,9 +97,11 @@ public void testCreateRoutine() {
 
         // find routine and do assertions
         Routine r = DB.routines().findOneBy(Routine.COLUMN_NAME, NAME);
-        assertNotNull(r);
-        assertEquals(NAME, r.getName());
-        assertEquals(new LocalTime(18, 30), r.getTime());
+
+        assertEquals("Routine count is wrong", 1, DB.routines().count());
+        assertNotNull("Routine is null", r);
+        assertEquals("Routine name is wrong", NAME, r.getName());
+        assertEquals("Routine time is wrong", new LocalTime(18, 30), r.getTime());
     }
 
 

Calendula/src/androidTest/java/es/usc/citius/servando/calendula/activities/RoutinesActivityEditTest.java

@@ -44,8 +44,8 @@
 
 public class RoutinesActivityEditTest extends ActivityInstrumentationTestCase2<RoutinesActivity> {
 
-    public static final String NAME_BEFORE_EDIT = "breakfast";
-    public static final String NAME_AFTER_EDIT = "lunch";
+    private static final String NAME_BEFORE_EDIT = "Breakfast";
+    private static final String NAME_AFTER_EDIT = "Lunch";
 
     private RoutinesActivity mActivity;
 
@@ -109,10 +109,10 @@ public void testEditRoutine() {
 
         // find edited routine and do assertions
         Routine r = DB.routines().findOneBy(Routine.COLUMN_NAME, NAME_AFTER_EDIT);
-        assertEquals(1, DB.routines().count());
-        assertNotNull(r);
-        assertEquals(NAME_AFTER_EDIT, r.getName());
-        assertEquals(new LocalTime(20, 0), r.getTime());
+        assertEquals("Routine count is wrong",1, DB.routines().count());
+        assertNotNull("Routine is null", r);
+        assertEquals("Routine name is wrong",NAME_AFTER_EDIT, r.getName());
+        assertEquals("Routine time is wrong", new LocalTime(20, 0), r.getTime());
     }
 
 

Calendula/src/main/java/es/usc/citius/servando/calendula/DailyAgendaRecyclerAdapter.java

@@ -227,7 +227,7 @@ public void onBindNormalItemViewHolder(NormalItemViewHolder viewHolder, DailyAge
             }
 
             viewHolder.title.setText(item.title);
-            viewHolder.hour.setText(item.time.toString("kk") + ":");
+            viewHolder.hour.setText(String.format("%s:", item.time.toString("HH")));
             viewHolder.minute.setText(item.time.toString("mm"));
 
             boolean allTaken = addMeds(viewHolder, item);

Calendula/src/main/java/es/usc/citius/servando/calendula/activities/ConfirmActivity.java

@@ -379,9 +379,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
         relativeTime = DateUtils.getRelativeTimeSpanString(dt.getMillis(), now.getMillis(), 5 * DateUtils.MINUTE_IN_MILLIS, DateUtils.FORMAT_ABBREV_ALL).toString();
 
-        hour.setText(time.toString("kk:"));
+        hour.setText(time.toString("HH:"));
         minute.setText(time.toString("mm"));
-        friendlyTime.setText(relativeTime.substring(0, 1).toUpperCase() + relativeTime.substring(1));
+        friendlyTime.setText(String.format("%s%s", relativeTime.substring(0, 1).toUpperCase(), relativeTime.substring(1)));
 
         if (isDistant) {
             fab.setBackgroundTintList(ColorStateList.valueOf(getResources().getColor(R.color.android_orange_dark)));

Calendula/src/main/java/es/usc/citius/servando/calendula/activities/PickupNotification.java

@@ -87,11 +87,15 @@ public static void notify(final Context context, final String title, final Strin
                 .setTicker(ticker)
                 .setContentIntent(defaultIntent)
                 .setStyle(style)
-                .setPriority(Notification.PRIORITY_DEFAULT)
-                .setVibrate(new long[]{1000, 200, 500, 200, 100, 200, 1000})
                 //.setSound(ringtoneUri != null ? ringtoneUri : Settings.System.DEFAULT_NOTIFICATION_URI)
                 .setAutoCancel(true);
 
+        if (NotificationHelper.isNotificationVibrationEnabled(context)) {
+            builder.setVibrate(NotificationHelper.VIBRATION_PATTERN_DEFAULT);
+        } else {
+            builder.setVibrate(NotificationHelper.VIBRATION_PATTERN_NONE);
+        }
+
         Notification n = builder.build();
         n.defaults = 0;
         n.ledARGB = 0x00ffa500;

Calendula/src/main/java/es/usc/citius/servando/calendula/activities/ReminderNotification.java

@@ -211,7 +211,7 @@ private static Notification buildNotification(Context context, NotificationOptio
                 .setSmallIcon(options.lost ? R.drawable.ic_pill_small_lost : R.drawable.ic_pill_small)
                 .setContentTitle(options.title)
                 .setContentText(options.text)
-                .setPriority(NotificationCompat.PRIORITY_HIGH)
+                .setPriority(NotificationCompat.PRIORITY_MAX)
                 // Provide a large icon, shown with the notification in the
                 // notification drawer on devices running Android 3.0 or later.
                 .setLargeIcon(options.picture)
@@ -226,11 +226,17 @@ private static Notification buildNotification(Context context, NotificationOptio
                 // or later.
                 .setStyle(options.style)
                 // Automatically dismiss the notification when it is touched.
-                .setAutoCancel(true);
+                .setAutoCancel(true)
+                // Set ringtone
+                .setSound(options.ringtone);
 
+        // if insistent is enabled, an activity with vibration will start
         if (!insistentNotifications) {
-            // if insistent is enabled, an activity with vibration will start
-            builder.setVibrate(new long[]{1000, 200, 100, 500, 400, 200, 100, 500, 400, 200, 100, 500, 1000}).setSound(options.ringtone);
+            if (NotificationHelper.isNotificationVibrationEnabled(context)) {
+                builder.setVibrate(NotificationHelper.VIBRATION_PATTERN_MEDS);
+            } else {
+                builder.setVibrate(NotificationHelper.VIBRATION_PATTERN_NONE);
+            }
         }
 
         if (!options.lost) {

Calendula/src/main/java/es/usc/citius/servando/calendula/drugdb/download/InstallDatabaseService.java

@@ -179,6 +179,7 @@ private void showNotification(int max, int prog) {
                 .setContentIntent(pIntent)
                 .setContentTitle(getString(R.string.install_db_notification_title))
                 .setContentText(getString(R.string.install_db_notification_content))
+                .setOnlyAlertOnce(true)
                 .setProgress(max, prog, false);
 
         getNotificationManager().notify(NOTIFICATION_ID, mBuilder.build());

Calendula/src/main/java/es/usc/citius/servando/calendula/jobs/CheckDatabaseUpdatesJob.java

@@ -18,7 +18,6 @@
 
 package es.usc.citius.servando.calendula.jobs;
 
-import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -106,7 +105,8 @@ private void notifyUpdate(Context ctx, final String database) {
                 .setTicker(ctx.getString(R.string.app_name) + ctx.getString(R.string.text_database_update_available))
                 .setSmallIcon(R.drawable.ic_launcher_white)
                 .setLargeIcon(IconUtils.icon(ctx, CommunityMaterial.Icon.cmd_database, R.color.white, 100).toBitmap())
-                .setVibrate(new long[]{0, 400})
+                .setVibrate(NotificationHelper.VIBRATION_PATTERN_DB)
+                .setPriority(NotificationCompat.PRIORITY_DEFAULT)
                 .setAutoCancel(true)
                 .setContentIntent(updateIntent);
 

Calendula/src/main/java/es/usc/citius/servando/calendula/notifications/NotificationHelper.kt

@@ -21,12 +21,24 @@ package es.usc.citius.servando.calendula.notifications
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
+import android.media.AudioManager
 import android.os.Build
 import es.usc.citius.servando.calendula.R
+import es.usc.citius.servando.calendula.util.PreferenceKeys
+import es.usc.citius.servando.calendula.util.PreferenceUtils
 
 
 object NotificationHelper {
 
+    @JvmField
+    val VIBRATION_PATTERN_MEDS =
+        longArrayOf(1000, 200, 100, 500, 400, 200, 100, 500, 400, 200, 100, 500, 1000)
+    @JvmField
+    val VIBRATION_PATTERN_DEFAULT = longArrayOf(1000, 200, 500, 200, 100, 200, 1000)
+    @JvmField
+    val VIBRATION_PATTERN_DB = longArrayOf(0, 400)
+    @JvmField
+    val VIBRATION_PATTERN_NONE = longArrayOf(0L)
 
     /**
      * Intended for high-importance med notifications such as intake reminders.
@@ -72,4 +84,26 @@ object NotificationHelper {
         }
     }
 
+    /**
+     * Get notification vibration setting for the app.
+     *
+     * @param context a [Context], required for getting audioManager
+     * @return a [Boolean], true if vibration setting is enabled; false otherwise
+     */
+    @JvmStatic
+    fun isNotificationVibrationEnabled(context: Context): Boolean {
+
+        val vibrationSettingInt =
+            PreferenceUtils.getInt(PreferenceKeys.SETTINGS_NOTIFICATION_VIBRATION, 0)
+        val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+
+        return when (vibrationSettingInt) {
+            0 -> true
+            1 -> return audioManager.getStreamVolume(AudioManager.STREAM_ALARM) != 0
+            // TODO this should not only be if system alarm volume is 0, but also if the selected ringtone is "None"
+            2 -> return audioManager.getStreamVolume(AudioManager.STREAM_ALARM) == 0
+            3 -> false
+            else -> true
+        }
+    }
 }

Calendula/src/main/java/es/usc/citius/servando/calendula/settings/notifications/NotificationPrefsContract.kt

@@ -30,6 +30,7 @@ interface NotificationPrefsContract {
         fun requestRingtone(reqCode: Int, ringtoneType: Int, currentValue: Uri?)
         fun setNotificationRingtoneText(text: String)
         fun setInsistentRingtoneText(text: String)
+        fun setVisibleNotificationManagementPref(visible: Boolean)
     }
 
     interface Presenter : IPresenter<View> {

Calendula/src/main/java/es/usc/citius/servando/calendula/settings/notifications/NotificationPrefsFragment.kt

@@ -22,6 +22,7 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.media.RingtoneManager
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
 import android.support.v7.preference.Preference
@@ -42,6 +43,7 @@ class NotificationPrefsFragment :
         private const val TAG = "NotificationPrefsFragm"
     }
 
+    private val applicationPackageName: String by lazy { activity!!.packageName as String }
     override val fragmentTitle: Int = R.string.pref_header_notifications
     override val presenter: NotificationPrefsContract.Presenter by lazy {
         NotificationPrefsPresenter(
@@ -67,6 +69,14 @@ class NotificationPrefsFragment :
                 presenter.selectInsistentRingtone()
                 return true
             }
+            PreferenceKeys.SETTINGS_NOTIFICATION_MANAGEMENT.key() -> {
+               if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                   val intent = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
+                           .putExtra(Settings.EXTRA_APP_PACKAGE, applicationPackageName)
+                   startActivity(intent)
+                }
+                return true
+            }
         }
         return super.onPreferenceTreeClick(preference)
     }
@@ -123,5 +133,19 @@ class NotificationPrefsFragment :
         insistentNotificationPref.summary = text
     }
 
+    override fun setVisibleNotificationManagementPref(visible: Boolean){
+        findPreference(PreferenceKeys.SETTINGS_NOTIFICATION_TONE.key()).apply{
+            isEnabled = !visible
+            isVisible = !visible
+        }
+        findPreference(PreferenceKeys.SETTINGS_NOTIFICATION_VIBRATION.key()).apply{
+            isEnabled = !visible
+            isVisible = !visible
+        }
+        findPreference(PreferenceKeys.SETTINGS_NOTIFICATION_MANAGEMENT.key()).apply{
+            isEnabled = visible
+            isVisible = visible
+        }
+    }
 
 }

Calendula/src/main/java/es/usc/citius/servando/calendula/settings/notifications/NotificationPrefsPresenter.kt

@@ -21,6 +21,7 @@ package es.usc.citius.servando.calendula.settings.notifications
 import android.content.Intent
 import android.media.RingtoneManager
 import android.net.Uri
+import android.os.Build
 import android.provider.Settings
 import es.usc.citius.servando.calendula.modules.ModuleManager
 import es.usc.citius.servando.calendula.modules.modules.StockModule
@@ -47,6 +48,12 @@ class NotificationPrefsPresenter(
             view.hideStockPref()
         }
         updateRingtoneSummaries()
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            view.setVisibleNotificationManagementPref(true)
+        } else {
+            view.setVisibleNotificationManagementPref(false)
+        }
     }
 
 

Calendula/src/main/java/es/usc/citius/servando/calendula/settings/privacy/PrivacyPrefsFragment.kt

@@ -24,6 +24,7 @@ import android.os.Bundle
 import android.support.v14.preference.SwitchPreference
 import android.support.v7.preference.ListPreference
 import android.support.v7.preference.Preference
+import android.view.WindowManager
 import com.github.javiersantos.materialstyleddialogs.MaterialStyledDialog
 import com.github.javiersantos.materialstyleddialogs.enums.Style
 import com.mikepenz.google_material_typeface_library.GoogleMaterial
@@ -44,7 +45,6 @@ class PrivacyPrefsFragment :
     PrivacyPrefsContract.View {
 
 
-
     companion object {
         private const val TAG = "PrivacyPrefsFragment"
     }
@@ -61,6 +61,7 @@ class PrivacyPrefsFragment :
     private val pinPref: Preference by lazy { findPreference(PreferenceKeys.UNLOCK_PIN.key()) }
     private val fingerprintPref: SwitchPreference by lazy { findPreference(PreferenceKeys.FINGERPRINT_ENABLED.key()) as SwitchPreference }
     private val pinTimeoutPref: ListPreference by lazy { findPreference(PreferenceKeys.UNLOCK_PIN_TIMEOUT.key()) as ListPreference }
+    private val secureWindowPref: SwitchPreference by lazy { findPreference(PreferenceKeys.SECURE_WINDOW.key()) as SwitchPreference }
 
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
@@ -86,6 +87,16 @@ class PrivacyPrefsFragment :
             pinTimeoutPref.key -> {
                 pinTimeoutPref.summary = pinTimeoutPref.entry
             }
+            secureWindowPref.key -> {
+                if (secureWindowPref.isChecked) {
+                    activity?.window?.setFlags(
+                        WindowManager.LayoutParams.FLAG_SECURE,
+                        WindowManager.LayoutParams.FLAG_SECURE
+                    )
+                } else {
+                    activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
+                }
+            }
         }
     }
 

Calendula/src/main/java/es/usc/citius/servando/calendula/util/PreferenceKeys.java

@@ -66,6 +66,8 @@ public enum PreferenceKeys {
     SETTINGS_ALARM_NOTIFICATIONS(R.string.prefkey_settings_alarm_notifications),
     SETTINGS_DATABASE_UPDATE(R.string.prefkey_settings_database_update),
     SETTINGS_NOTIFICATION_TONE(R.string.prefkey_settings_notification_tone),
+    SETTINGS_NOTIFICATION_VIBRATION(R.string.prefkey_settings_notification_vibration),
+    SETTINGS_NOTIFICATION_MANAGEMENT(R.string.prefkey_settings_notification_management),
     SETTINGS_INSISTENT_NOTIFICATION_TONE(R.string.prefkey_settings_insistent_notification_tone),
     SETTINGS_STOCK_ALERT_DAYS(R.string.prefkey_settings_stock_alert_days),
     SETTINGS_DEFAULTS_LOADED(R.string.prefkey_settings_defaults_loaded),