Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60fcd464 authored by tibbi's avatar tibbi
Browse files

add file manager and gallery to Pro apps, reduce grace period to 1 week 

- Google Play doesn't allow 3 week long sales as I initially wanted
parent 1ad0e3e0

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ buildscript { 
        propMinSdkVersion = 21

        propTargetSdkVersion = propCompileSdkVersion

        propVersionCode = 1

        propVersionName = '5.3.8'

        propVersionName = '5.3.9'

        kotlin_version = '1.3.0'

    }

commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/UpgradeToProDialog.kt

+5 −5
Original line number Diff line number Diff line
@@ -10,14 +10,14 @@ import com.simplemobiletools.commons.extensions.setupDialogStuff 
import kotlinx.android.synthetic.main.dialog_upgrade_to_pro.view.*



class UpgradeToProDialog(val activity: Activity) {

    val packageName = activity.baseConfig.appId.removeSuffix(".debug")

    val DRAW_FREE_TILL = 1543104000000L     // November 25

    val NOV_25 = "Nov 25 2018"

    private val packageName = activity.baseConfig.appId.removeSuffix(".debug")

    private val FIRST_APPS_FREE_TILL = 1541980800000L     // November 12

    private val NOV_12 = "Nov 12 2018"



    init {

        var text = activity.getString(R.string.upgrade_to_pro_long)

        if (packageName.endsWith("draw") && System.currentTimeMillis() < DRAW_FREE_TILL) {

            val freeTill = String.format(activity.getString(R.string.it_is_free), NOV_25)

        if ((packageName.endsWith("draw") || packageName.endsWith("gallery") || packageName.endsWith("filemanager")) && System.currentTimeMillis() < FIRST_APPS_FREE_TILL) {

            val freeTill = String.format(activity.getString(R.string.it_is_free), NOV_12)

            text += "\n$freeTill"

        }

commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt

+1 −1
Original line number Diff line number Diff line
@@ -250,4 +250,4 @@ fun getConflictResolution(resolutions: LinkedHashMap<String, Int>, path: String) 
    }

}



val proPackages = arrayListOf("draw")
 
val proPackages = arrayListOf("draw", "gallery", "filemanager")