Change artifact name on tagged builds

.woodpecker/build.yaml

@@ -8,7 +8,7 @@ steps:
   sign:
     image: alvrme/alpine-android:android-33-jdk11
     commands:
-      - ./scripts/apk-sign.sh LemmInfinity-signed.apk app/build/outputs/apk/release/app-release-unsigned.apk
+      - ./scripts/apk-sign.sh Eternity-signed.apk app/build/outputs/apk/release/app-release-unsigned.apk
     secrets: [ APK_KS_PASS, APK_KS, APK_KS_ALIAS ]
     when:
       event: [ tag ]
@@ -17,7 +17,7 @@ steps:
     settings:
       base_url: https://codeberg.org
       files:
-        - LemmInfinity-signed.apk
+        - Eternity-signed.apk
       api_key:
         from_secret: GITEA_ACCESS_TOKEN
       target: main

app/build.gradle

@@ -21,8 +21,8 @@ android {
         applicationId "eu.toldi.infinityforlemmy"
         minSdk 21
         targetSdk 33
-        versionCode 129
+        versionCode 130
-        versionName "0.1.0"
+        versionName "0.1.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
             annotationProcessorOptions {

app/src/main/java/eu/toldi/infinityforlemmy/asynctasks/InsertSubscribedThings.java

@@ -118,25 +118,20 @@ public class InsertSubscribedThings {
             (List<SubscribedSubredditData> newSubscribedSubreddits,
              List<SubscribedSubredditData> oldSubscribedSubreddits,
              List<String> unsubscribedSubredditNames) {
-        int newIndex = 0;
+        List<String> oldSubredditNames = new ArrayList<>();
-        for (int oldIndex = 0; oldIndex < oldSubscribedSubreddits.size(); oldIndex++) {
+        for (SubscribedSubredditData subredditData : oldSubscribedSubreddits) {
-            if (newIndex >= newSubscribedSubreddits.size()) {
+            oldSubredditNames.add(subredditData.getQualified_name());
-                for (; oldIndex < oldSubscribedSubreddits.size(); oldIndex++) {
+        }
-                    unsubscribedSubredditNames.add(oldSubscribedSubreddits.get(oldIndex).getQualified_name());
-                }
-                return;
-            }
 
-            SubscribedSubredditData old = oldSubscribedSubreddits.get(oldIndex);
+        List<String> newSubredditNames = new ArrayList<>();
-            for (; newIndex < newSubscribedSubreddits.size(); newIndex++) {
+        for (SubscribedSubredditData subredditData : newSubscribedSubreddits) {
-                if (newSubscribedSubreddits.get(newIndex).getQualified_name().compareToIgnoreCase(old.getQualified_name()) == 0) {
+            newSubredditNames.add(subredditData.getQualified_name());
-                    newIndex++;
+        }
-                    break;
+
-                }
+
-                if (newSubscribedSubreddits.get(newIndex).getQualified_name().compareToIgnoreCase(old.getQualified_name()) > 0) {
+        for (String subredditName : oldSubredditNames) {
-                    unsubscribedSubredditNames.add(old.getQualified_name());
+            if (!newSubredditNames.contains(subredditName)) {
-                    break;
+                unsubscribedSubredditNames.add(subredditName);
-                }
             }
         }
     }

app/src/main/java/eu/toldi/infinityforlemmy/services/DownloadMediaService.java

@@ -153,7 +153,7 @@ public class DownloadMediaService extends Service {
                         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
                             File directory = getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES);
                             if (directory != null) {
-                                String directoryPath = separateDownloadFolder && subredditName != null && !subredditName.equals("") ? directory.getAbsolutePath() + "/Infinity/" + subredditName + "/" : directory.getAbsolutePath() + "/Infinity/";
+                                String directoryPath = separateDownloadFolder && subredditName != null && !subredditName.equals("") ? directory.getAbsolutePath() + "/Eternity/" + subredditName + "/" : directory.getAbsolutePath() + "/Eternity/";
                                 File infinityDir = new File(directoryPath);
                                 if (!infinityDir.exists() && !infinityDir.mkdirs()) {
                                     downloadFinished(mediaType, randomNotificationIdOffset, mimeType,
@@ -168,7 +168,7 @@ public class DownloadMediaService extends Service {
                             }
                         } else {
                             String dir = mediaType == EXTRA_MEDIA_TYPE_VIDEO ? Environment.DIRECTORY_MOVIES : Environment.DIRECTORY_PICTURES;
-                            destinationFileUriString = separateDownloadFolder && subredditName != null && !subredditName.equals("") ? dir + "/Infinity/" + subredditName + "/" : dir + "/Infinity/";
+                            destinationFileUriString = separateDownloadFolder && subredditName != null && !subredditName.equals("") ? dir + "/Eternity/" + subredditName + "/" : dir + "/Eternity/";
                         }
                         isDefaultDestination = true;
                     } else {

app/src/main/java/eu/toldi/infinityforlemmy/subscribedsubreddit/SubscribedSubredditDao.java

@@ -31,7 +31,7 @@ public interface SubscribedSubredditDao {
     @Query("SELECT * from subscribed_subreddits WHERE qualified_name = :qualified_name COLLATE NOCASE AND username = :accountName COLLATE NOCASE LIMIT 1")
     SubscribedSubredditData getSubscribedSubredditByQualifiedName(String qualified_name, String accountName);
 
-    @Query("DELETE FROM subscribed_subreddits WHERE name = :subredditName COLLATE NOCASE AND username = :accountName COLLATE NOCASE")
+    @Query("DELETE FROM subscribed_subreddits WHERE qualified_name = :subredditName COLLATE NOCASE AND username = :accountName COLLATE NOCASE")
     void deleteSubscribedSubreddit(String subredditName, String accountName);
 
     @Query("SELECT * from subscribed_subreddits WHERE username = :qualified_name AND name LIKE '%' || :searchQuery || '%' COLLATE NOCASE AND is_favorite = 1 ORDER BY name COLLATE NOCASE ASC")

app/src/main/java/eu/toldi/infinityforlemmy/subscribedsubreddit/SubscribedSubredditData.java

@@ -129,13 +129,13 @@ public class SubscribedSubredditData implements Parcelable {
 
     @Override
     public int hashCode() {
-        return id;
+        return id + username.hashCode();
     }
 
     @Override
     public boolean equals(@Nullable Object obj) {
         if (obj instanceof SubscribedSubredditData) {
-            return id == ((SubscribedSubredditData) obj).getId();
+            return id == ((SubscribedSubredditData) obj).getId() && username.equalsIgnoreCase(((SubscribedSubredditData) obj).getUsername());
         }
         return false;
     }