Merge pull request #21 from zorgluf/dev

Dev

Author: zorgluf

app/build.gradle

@@ -9,7 +9,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         def nav_version = '2.4.1'
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
     }
@@ -21,8 +21,8 @@ android {
         applicationId "fr.nuage.souvenirs"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 29
-        versionName "2.8.4"
+        versionCode 30
+        versionName "2.8.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         setProperty("archivesBaseName", "souvenirs-$versionName")
     }
@@ -54,9 +54,6 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.webkit:webkit:1.4.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     def lifecycle_version = "2.4.1"
     implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
@@ -81,6 +78,6 @@ dependencies {
 
 buildscript {
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }

app/src/androidTest/java/fr/nuage/souvenirs/ExampleInstrumentedTest.java

@@ -1,5 +1,7 @@
 package fr.nuage.souvenirs;
 
+import static java.lang.Math.min;
+
 import android.annotation.SuppressLint;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -74,7 +76,7 @@ private void updateShorcuts() {
         File albumsPath = new File(getApplication().getApplicationContext().getExternalFilesDir(null),"albums");
         Albums albums = Albums.getInstance(albumsPath.getPath());
         ArrayList<ShortcutInfoCompat> shorcutsList = new ArrayList<>();
-        for (Album a : albums.getAlbumList().subList(0,MAX_SHORTCUTS-1)) {
+        for (Album a : albums.getAlbumList().subList(0,min(MAX_SHORTCUTS-1,albums.getAlbumList().size()))) {
             //we exclude albums edited more than 30 days ago
             long deltaDays = TimeUnit.DAYS.convert((new Date()).getTime() - a.getPagesLastEditDate().getTime(), TimeUnit.MILLISECONDS);
             if (deltaDays > DIRECT_SHARE_MAX_DAYS) {

app/src/main/java/fr/nuage/souvenirs/AlbumListActivity.java

@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         def nav_version = '2.4.1'
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
 

app/src/test/java/fr/nuage/souvenirs/ExampleUnitTest.java

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip