Add freemium model with 30-day trial, Google Play IAP, and write-access gating #630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

tobihagemann wants to merge 46 commits into develop from feature/freemium

buildsystem/dependencies.gradle

-Original file line number
+Diff line change
@@ Expand Up / @@ -105,6 +105,8 @@ ext { @@
     	recyclerViewFastScrollVersion = '2.0.1'
+    	billingclientVersion = '8.2.1'
     	// testing dependencies
     	jUnitVersion = '5.11.4'
@@ Expand Down Expand Up / @@ -202,7 +204,8 @@ ext { @@
     			zxcvbn                         : "com.nulab-inc:zxcvbn:${zxcvbnVersion}",
     			scaleImageView                 : "com.github.cryptomator:subsampling-scale-image-view:${scaleImageViewVersion}",
     			lruFileCache                   : "com.github.solkin:disk-lru-cache:${lruFileCacheVersion}",
-    			jsonWebToken                   : "com.auth0:java-jwt:${jsonWebTokenVersion}"
+    			jsonWebToken                   : "com.auth0:java-jwt:${jsonWebTokenVersion}",
+    			billing                        : "com.android.billingclient:billing:${billingclientVersion}"
     	]
     }

data/build.gradle

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -49,6 +49,10 @@ android {
  
    			dimension "version"

    		}

    		playstoreiap {

    			dimension "version"

    		}

    		apkstore {

    			dimension "version"

    		}

    @@ -71,6 +75,10 @@ android {
  
    			java.srcDirs = ['src/main/java/', 'src/apiKey/java/', 'src/apkStorePlaystore/java/']

    		}

    		playstoreiap {

    			java.srcDirs = ['src/main/java/', 'src/apiKey/java/', 'src/apkStorePlaystore/java/']

    		}

    		apkstore {

    			java.srcDirs = ['src/main/java/', 'src/apiKey/java/', 'src/apkStorePlaystore/java/']

    		}

    @@ -89,7 +97,7 @@ android {
  
    	}

    	packagingOptions {

    		resources {

    			excludes += ['META-INF/DEPENDENCIES', 'META-INF/NOTICE.md', 'META-INF/INDEX.LIST']

    			excludes += ['META-INF/DEPENDENCIES', 'META-INF/NOTICE.md', 'META-INF/INDEX.LIST', 'META-INF/versions/9/OSGI-INF/MANIFEST.MF']

    		}

    	}

    @@ -102,7 +110,7 @@ android {
  
    }

    greendao {

    	schemaVersion 13

    	schemaVersion 14

    }

    configurations.all {

    @@ -112,13 +120,20 @@ configurations.all {
  
    dependencies {

    	def dependencies = rootProject.ext.dependencies

    	def cloudFlavors = ['playstore', 'playstoreiap', 'apkstore', 'fdroid', 'accrescent']

    	def googleFlavors = ['playstore', 'playstoreiap', 'apkstore']

    	def addToFlavors = { flavors, dep, Closure config = null ->

    		flavors.each { flavor ->

    			if (config) {

    				add("${flavor}Implementation", dep, config)

    			} else {

    				add("${flavor}Implementation", dep)

    			}

    		}

    	}

    	implementation project(':domain')

    	implementation project(':util')

    	playstoreImplementation dependencies.pcloud

    	apkstoreImplementation dependencies.pcloud

    	fdroidImplementation dependencies.pcloud

    	accrescentImplementation dependencies.pcloud

    	coreLibraryDesugaring dependencies.coreDesugaring

    @@ -134,63 +149,30 @@ dependencies {
  
    	implementation dependencies.jsonWebToken

    	// cloud

    	playstoreImplementation dependencies.dropboxCore

    	playstoreImplementation dependencies.dropboxAndroid

    	apkstoreImplementation dependencies.dropboxCore

    	apkstoreImplementation dependencies.dropboxAndroid

    	fdroidImplementation dependencies.dropboxCore

    	fdroidImplementation dependencies.dropboxAndroid

    	accrescentImplementation dependencies.dropboxCore

    	accrescentImplementation dependencies.dropboxAndroid

    	playstoreImplementation dependencies.msgraphAuth

    	apkstoreImplementation dependencies.msgraphAuth

    	fdroidImplementation dependencies.msgraphAuth

    	accrescentImplementation dependencies.msgraphAuth

    	playstoreImplementation dependencies.msgraph

    	apkstoreImplementation dependencies.msgraph

    	fdroidImplementation dependencies.msgraph

    	accrescentImplementation dependencies.msgraph

    	addToFlavors(cloudFlavors, dependencies.dropboxCore)

    	addToFlavors(cloudFlavors, dependencies.dropboxAndroid)

    	addToFlavors(cloudFlavors, dependencies.msgraphAuth)

    	addToFlavors(cloudFlavors, dependencies.msgraph)

    	addToFlavors(cloudFlavors, dependencies.pcloud)

    	implementation dependencies.stax

    	api dependencies.minIo

    	playstoreImplementation(dependencies.googlePlayServicesAuth) {

    	addToFlavors(googleFlavors, dependencies.googlePlayServicesAuth) {

    		exclude module: 'guava-jdk5'

    		exclude module: 'httpclient'

    		exclude module: 'googlehttpclient'

    		exclude group: "com.google.http-client", module: "google-http-client"

    	}

    	apkstoreImplementation(dependencies.googlePlayServicesAuth) {

    		exclude module: 'guava-jdk5'

    		exclude module: 'httpclient'

    		exclude module: "google-http-client"

    		exclude group: "com.google.http-client", module: "google-http-client"

    	}

    	playstoreImplementation(dependencies.googleApiServicesDrive) {

    	addToFlavors(googleFlavors, dependencies.googleApiServicesDrive) {

    		exclude module: 'guava-jdk5'

    		exclude module: 'httpclient'

    		exclude module: 'googlehttpclient'

    		exclude group: "com.google.http-client", module: "google-http-client"

    	}

    	apkstoreImplementation(dependencies.googleApiServicesDrive) {

    		exclude module: 'guava-jdk5'

    		exclude module: 'httpclient'

    		exclude module: "google-http-client"

    		exclude group: "com.google.http-client", module: "google-http-client"

    	}

    	playstoreImplementation(dependencies.googleApiClientAndroid) {

    		exclude module: 'guava-jdk5'

    		exclude module: 'httpclient'

    		exclude module: "google-http-client"

    		exclude module: "jetified-google-http-client"

    		exclude group: "com.google.http-client", module: "google-http-client"

    		exclude group: "com.google.http-client", module: "jetified-google-http-client"

    	}

    	apkstoreImplementation(dependencies.googleApiClientAndroid) {

    	addToFlavors(googleFlavors + ['accrescent'], dependencies.googleApiClientAndroid) {

    		exclude module: 'guava-jdk5'

    		exclude module: 'httpclient'

    		exclude module: "google-http-client"

    @@ -199,10 +181,8 @@ dependencies {
  
    		exclude group: "com.google.http-client", module: "jetified-google-http-client"

    	}

    	playstoreImplementation dependencies.trackingFreeGoogleCLient

    	apkstoreImplementation dependencies.trackingFreeGoogleCLient

    	playstoreImplementation dependencies.trackingFreeGoogleAndroidCLient

    	apkstoreImplementation dependencies.trackingFreeGoogleAndroidCLient

    	addToFlavors(googleFlavors, dependencies.trackingFreeGoogleCLient)

    	addToFlavors(googleFlavors + ['accrescent'], dependencies.trackingFreeGoogleAndroidCLient)

    	// rest

    	implementation dependencies.rxJava

data/src/androidTest/java/org/cryptomator/data/db/UpgradeDatabaseTest.kt

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,10 +6,12 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 @@
     import androidx.test.filters.SmallTest
     import androidx.test.platform.app.InstrumentationRegistry
     import com.google.common.base.Optional
+    import org.cryptomator.data.BuildConfig
     import org.cryptomator.data.db.entities.CloudEntityDao
     import org.cryptomator.data.db.entities.UpdateCheckEntityDao
     import org.cryptomator.data.db.entities.VaultEntityDao
     import org.cryptomator.domain.CloudType
+    import org.cryptomator.util.FlavorConfig
     import org.cryptomator.util.SharedPreferencesHandler
     import org.cryptomator.util.crypto.CredentialCryptor
     import org.cryptomator.util.crypto.CryptoMode
@@ Expand All / @@ -28,17 +30,19 @@ import org.junit.runner.RunWith @@
     class UpgradeDatabaseTest {
     	private val context = InstrumentationRegistry.getInstrumentation().context
-    	private val sharedPreferencesHandler = SharedPreferencesHandler(context)
     	private lateinit var db: Database
+    	private lateinit var sharedPreferencesHandler: SharedPreferencesHandler
     	@Before
     	fun setup() {
     		db = StandardDatabase(SQLiteDatabase.create(null))
+    		sharedPreferencesHandler = SharedPreferencesHandler(context)
     	}
     	@After
     	fun tearDown() {
     		db.close()
+    		sharedPreferencesHandler.removeAllEntries()
     	}
     	@Test
@@ Expand All / @@ -56,6 +60,7 @@ class UpgradeDatabaseTest { @@
     		Upgrade10To11().applyTo(db, 10)
     		Upgrade11To12(sharedPreferencesHandler).applyTo(db, 11)
     		Upgrade12To13(context).applyTo(db, 12)
+    		Upgrade13To14(sharedPreferencesHandler).applyTo(db, 13)
     		CloudEntityDao(DaoConfig(db, CloudEntityDao::class.java)).loadAll()
     		VaultEntityDao(DaoConfig(db, VaultEntityDao::class.java)).loadAll()
@@ Expand Down Expand Up / @@ -839,7 +844,6 @@ class UpgradeDatabaseTest { @@
     		}
     	}
     	@Test
     	fun upgrade12To13OneDrive() {
     		Upgrade0To1().applyTo(db, 0)
@@ Expand Down Expand Up / @@ -951,4 +955,99 @@ class UpgradeDatabaseTest { @@
     			Assert.assertThat(it.getString(it.getColumnIndex("ACCESS_TOKEN_CRYPTO_MODE")), CoreMatchers.`is`(CryptoMode.GCM.name))
     		}
     	}
+    	@Test
+    	fun upgrade13To14ExistingLicense() {
+    		Upgrade0To1().applyTo(db, 0)
+    		Upgrade1To2().applyTo(db, 1)
+    		Upgrade2To3(context).applyTo(db, 2)
+    		Upgrade3To4().applyTo(db, 3)
+    		Upgrade4To5().applyTo(db, 4)
+    		Upgrade5To6().applyTo(db, 5)
+    		Upgrade6To7().applyTo(db, 6)
+    		Upgrade7To8().applyTo(db, 7)
+    		Upgrade8To9(sharedPreferencesHandler).applyTo(db, 8)
+    		Upgrade9To10(sharedPreferencesHandler).applyTo(db, 9)
+    		Upgrade10To11().applyTo(db, 10)
+    		Upgrade11To12(sharedPreferencesHandler).applyTo(db, 11)
+    		Upgrade12To13(context).applyTo(db, 12)
+    		val licenseToken = "licenseToken"
+    		val releaseNote = "releaseNote"
+    		val version = "version"
+    		val urlApk = "urlApk"
+    		val apkSha256 = "apkSha256"
+    		val urlReleaseNote = "urlReleaseNote"
+    		Sql.update("UPDATE_CHECK_ENTITY")
+    			.set("LICENSE_TOKEN", Sql.toString(licenseToken))
+    			.set("RELEASE_NOTE", Sql.toString(releaseNote))
+    			.set("VERSION", Sql.toString(version))
+    			.set("URL_TO_APK", Sql.toString(urlApk))
+    			.set("APK_SHA256", Sql.toString(apkSha256))
+    			.set("URL_TO_RELEASE_NOTE", Sql.toString(urlReleaseNote))
+    			.executeOn(db)
+    		Upgrade13To14(sharedPreferencesHandler).applyTo(db, 13)
+    		Assert.assertThat(sharedPreferencesHandler.hasCompletedWelcomeFlow(), CoreMatchers.`is`(true))
+    		if (!FlavorConfig.isPremiumFlavor) {
+    			Assert.assertThat(sharedPreferencesHandler.licenseToken(), CoreMatchers.`is`(licenseToken))
+    		}
+    		Sql.query("UPDATE_CHECK_ENTITY").executeOn(db).use {
+    			it.moveToFirst()
+    			Assert.assertThat(it.getString(it.getColumnIndex("RELEASE_NOTE")), CoreMatchers.`is`(releaseNote))
+    			Assert.assertThat(it.getString(it.getColumnIndex("VERSION")), CoreMatchers.`is`(version))
+    			Assert.assertThat(it.getString(it.getColumnIndex("URL_TO_APK")), CoreMatchers.`is`(urlApk))
+    			Assert.assertThat(it.getString(it.getColumnIndex("APK_SHA256")), CoreMatchers.`is`(apkSha256))
+    			Assert.assertThat(it.getString(it.getColumnIndex("URL_TO_RELEASE_NOTE")), CoreMatchers.`is`(urlReleaseNote))
+    		}
+    	}
+    	@Test
+    	fun upgrade13To14NoLicense() {
+    		Upgrade0To1().applyTo(db, 0)
+    		Upgrade1To2().applyTo(db, 1)
+    		Upgrade2To3(context).applyTo(db, 2)
+    		Upgrade3To4().applyTo(db, 3)
+    		Upgrade4To5().applyTo(db, 4)
+    		Upgrade5To6().applyTo(db, 5)
+    		Upgrade6To7().applyTo(db, 6)
+    		Upgrade7To8().applyTo(db, 7)
+    		Upgrade8To9(sharedPreferencesHandler).applyTo(db, 8)
+    		Upgrade9To10(sharedPreferencesHandler).applyTo(db, 9)
+    		Upgrade10To11().applyTo(db, 10)
+    		Upgrade11To12(sharedPreferencesHandler).applyTo(db, 11)
+    		Upgrade12To13(context).applyTo(db, 12)
+    		val releaseNote = "releaseNote"
+    		val version = "version"
+    		val urlApk = "urlApk"
+    		val apkSha256 = "apkSha256"
+    		val urlReleaseNote = "urlReleaseNote"
+    		Sql.update("UPDATE_CHECK_ENTITY")
+    			.set("RELEASE_NOTE", Sql.toString(releaseNote))
+    			.set("VERSION", Sql.toString(version))
+    			.set("URL_TO_APK", Sql.toString(urlApk))
+    			.set("APK_SHA256", Sql.toString(apkSha256))
+    			.set("URL_TO_RELEASE_NOTE", Sql.toString(urlReleaseNote))
+    			.executeOn(db)
+    		Upgrade13To14(sharedPreferencesHandler).applyTo(db, 13)
+    		Assert.assertThat(sharedPreferencesHandler.hasCompletedWelcomeFlow(), CoreMatchers.`is`(true))
+    		Assert.assertThat(sharedPreferencesHandler.licenseToken(), CoreMatchers.`is`(""))
+    		Sql.query("UPDATE_CHECK_ENTITY").executeOn(db).use {
+    			it.moveToFirst()
+    			Assert.assertThat(it.getString(it.getColumnIndex("RELEASE_NOTE")), CoreMatchers.`is`(releaseNote))
+    			Assert.assertThat(it.getString(it.getColumnIndex("VERSION")), CoreMatchers.`is`(version))
+    			Assert.assertThat(it.getString(it.getColumnIndex("URL_TO_APK")), CoreMatchers.`is`(urlApk))
+    			Assert.assertThat(it.getString(it.getColumnIndex("APK_SHA256")), CoreMatchers.`is`(apkSha256))
+    			Assert.assertThat(it.getString(it.getColumnIndex("URL_TO_RELEASE_NOTE")), CoreMatchers.`is`(urlReleaseNote))
+    		}
+    	}
     }

data/src/main/java/org/cryptomator/data/db/DatabaseUpgrades.java

-Original file line number
+Diff line change
@@ -1,7 +1,5 @@
     package org.cryptomator.data.db;
-    import static java.lang.String.format;
     import java.util.ArrayList;
     import java.util.Collections;
     import java.util.Comparator;
@@ Expand All / @@ -12,6 +10,8 @@ @@
     import javax.inject.Inject;
     import javax.inject.Singleton;
+    import static java.lang.String.format;
     @Singleton
     class DatabaseUpgrades {
@@ Expand All / @@ -31,7 +31,8 @@ public DatabaseUpgrades( // @@
     			Upgrade9To10 upgrade9To10, //
     			Upgrade10To11 upgrade10To11, //
     			Upgrade11To12 upgrade11To12, //
-    			Upgrade12To13 upgrade12To13
+    			Upgrade12To13 upgrade12To13, //
+    			Upgrade13To14 upgrade13To14
     	) {
     		availableUpgrades = defineUpgrades( //
@@ Expand All / @@ -47,7 +48,8 @@ public DatabaseUpgrades( // @@
     				upgrade9To10, //
     				upgrade10To11, //
     				upgrade11To12, //
-    				upgrade12To13);
+    				upgrade12To13, //
+    				upgrade13To14);
     	}
     	private Map<Integer, List<DatabaseUpgrade>> defineUpgrades(DatabaseUpgrade... upgrades) {
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add freemium model with 30-day trial, Google Play IAP, and write-access gating #630

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Add freemium model with 30-day trial, Google Play IAP, and write-access gating #630

Are you sure you want to change the base?

Uh oh!

Add freemium model with 30-day trial, Google Play IAP, and write-access gating #630

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!