show outdated warning depending on subscription key

Signed-off-by: tobiasKaminsky <[email protected]>

Author: tobiasKaminsky

app/schemas/com.nextcloud.client.database.NextcloudDatabase/94.json

@@ -32,6 +32,14 @@ class CapabilityUtilsIT : AbstractIT() {
         assertTrue(test(OwnCloudVersion.nextcloud_20))
     }
 
-    private fun test(version: OwnCloudVersion): Boolean =
-        CapabilityUtils.checkOutdatedWarning(targetContext.resources, version, false)
+    @Test
+    fun checkOutdatedWarningWithSubscription() {
+        assertFalse(test(NextcloudVersion.nextcloud_31))
+        assertFalse(test(NextcloudVersion.nextcloud_30))
+
+        assertFalse(test(OwnCloudVersion.nextcloud_20, true))
+    }
+
+    private fun test(version: OwnCloudVersion, hasValidSubscription: Boolean = false): Boolean =
+        CapabilityUtils.checkOutdatedWarning(targetContext.resources, version, false, hasValidSubscription)
 }

app/src/androidTest/java/com/owncloud/android/utils/theme/CapabilityUtilsIT.kt

@@ -83,7 +83,8 @@ import com.owncloud.android.db.ProviderMeta
         AutoMigration(from = 89, to = 90),
         AutoMigration(from = 90, to = 91),
         AutoMigration(from = 91, to = 92),
-        AutoMigration(from = 92, to = 93, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class)
+        AutoMigration(from = 92, to = 93, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
+        AutoMigration(from = 93, to = 94, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class)
     ],
     exportSchema = true
 )

app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt

@@ -142,5 +142,7 @@ data class CapabilityEntity(
     @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_DEFAULT_PERMISSIONS)
     val defaultPermissions: Int?,
     @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_USER_STATUS_SUPPORTS_BUSY)
-    val userStatusSupportsBusy: Int?
+    val userStatusSupportsBusy: Int?,
+    @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_HAS_VALID_SUBSCRIPTION)
+    val hasValidSubscription: Int?
 )

app/src/main/java/com/nextcloud/client/database/entity/CapabilityEntity.kt

@@ -2419,6 +2419,8 @@ private ContentValues createContentValues(String accountName, OCCapability capab
         contentValues.put(ProviderTableMeta.CAPABILITIES_NOTES_FOLDER_PATH, capability.getNotesFolderPath());
 
         contentValues.put(ProviderTableMeta.CAPABILITIES_DEFAULT_PERMISSIONS, capability.getDefaultPermissions());
+        
+        contentValues.put(ProviderTableMeta.CAPABILITIES_HAS_VALID_SUBSCRIPTION, capability.getHasValidSubscription().getValue());
 
         return contentValues;
     }
@@ -2603,6 +2605,7 @@ private OCCapability createCapabilityInstance(Cursor cursor) {
             capability.setNotesFolderPath(getString(cursor, ProviderTableMeta.CAPABILITIES_NOTES_FOLDER_PATH));
 
             capability.setDefaultPermissions(getInt(cursor, ProviderTableMeta.CAPABILITIES_DEFAULT_PERMISSIONS));
+            capability.setHasValidSubscription(getBoolean(cursor, ProviderTableMeta.CAPABILITIES_HAS_VALID_SUBSCRIPTION));
         }
 
         return capability;

app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -23,7 +23,7 @@
  */
 public class ProviderMeta {
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 93;
+    public static final int DB_VERSION = 94;
 
     private ProviderMeta() {
         // No instance
@@ -289,6 +289,7 @@ static public class ProviderTableMeta implements BaseColumns {
         public static final String CAPABILITIES_FILES_DOWNLOAD_LIMIT_DEFAULT = "files_download_limit_default";
         public static final String CAPABILITIES_NOTES_FOLDER_PATH = "notes_folder_path";
         public static final String CAPABILITIES_DEFAULT_PERMISSIONS = "default_permissions";
+        public static final String CAPABILITIES_HAS_VALID_SUBSCRIPTION = "has_valid_subscription";
 
         //Columns of Uploads table
         public static final String UPLOADS_LOCAL_PATH = "local_path";

app/src/main/java/com/owncloud/android/db/ProviderMeta.java

@@ -431,7 +431,8 @@ class FileDisplayActivity :
             CapabilityUtils.checkOutdatedWarning(
                 getResources(),
                 user.get().server.version,
-                capabilities.extendedSupport.isTrue
+                capabilities.extendedSupport.isTrue,
+                capabilities.hasValidSubscription.isTrue
             )
         ) {
             DisplayUtils.showServerOutdatedSnackbar(this, Snackbar.LENGTH_LONG)

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

@@ -87,4 +87,11 @@ public static boolean checkOutdatedWarning(Resources resources,
                 version.isOlderThan(MainApp.OUTDATED_SERVER_VERSION))
             && !hasExtendedSupport;
     }
+
+    public static boolean checkOutdatedWarning(Resources resources,
+                                               OwnCloudVersion version,
+                                               boolean hasExtendedSupport,
+                                               boolean hasValidSubscription) {
+        return checkOutdatedWarning(resources, version, hasExtendedSupport) && !hasValidSubscription;
+    }
 }

app/src/main/java/com/owncloud/android/utils/theme/CapabilityUtils.java

@@ -10,7 +10,7 @@
  */
 buildscript {
     ext {
-        androidLibraryVersion ="2f798d3f4b0b18458af0c917eb39ad8ca45e5b55"
+        androidLibraryVersion ="d525104338a94b61df6cf44041081d95ed2955c9"
         androidCommonLibraryVersion = "0.29.0"
         androidPluginVersion = '8.13.0'
         androidxMediaVersion = "1.5.1"

build.gradle

@@ -17648,6 +17648,11 @@
             <sha256 value="b29d8928cba81c13d016ac2e0b7a7d40f1b2e71f8229d65efcffb871a27576de" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="d525104338a94b61df6cf44041081d95ed2955c9">
+         <artifact name="android-library-d525104338a94b61df6cf44041081d95ed2955c9.pom">
+            <sha256 value="54aed157e9fbecdd01361b651f4f25163ffe6589d50c9506110f450e6faa9b01" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="d5f21fa1ec5b67c564983b0c8a07bc3acd96f695">
          <artifact name="android-library-d5f21fa1ec5b67c564983b0c8a07bc3acd96f695.aar">
             <sha256 value="95c86f501a4c1a2e055ba2d1fe68f5ffeed3613492bdaf0594abbae4b21b9227" origin="Generated by Gradle" reason="Artifact is not signed"/>