diff options
-rwxr-xr-x | org.fox.ttrss/build.gradle | 11 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java | 11 | ||||
-rwxr-xr-x | tt-rss-android.iml | 3 |
3 files changed, 20 insertions, 5 deletions
diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle index 4a23cd3e..b6ebc812 100755 --- a/org.fox.ttrss/build.gradle +++ b/org.fox.ttrss/build.gradle @@ -8,6 +8,7 @@ android { applicationId "org.fox.ttrss" buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L" buildConfigField "boolean", "ENABLE_TRIAL", "true" + buildConfigField "boolean", "ENABLE_UPDATER", "false" minSdkVersion 16 targetSdkVersion 29 } @@ -37,11 +38,12 @@ android { fdroid { minifyEnabled false - versionNameSuffix "-fdroid" + versionNameSuffix "-fdroid" proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - buildConfigField "boolean", "ENABLE_TRIAL", "false" - signingConfig signingConfigs.fdroid - matchingFallbacks = ['release'] + buildConfigField "boolean", "ENABLE_TRIAL", "false" + buildConfigField "boolean", "ENABLE_UPDATER", "true" + signingConfig signingConfigs.fdroid + matchingFallbacks = ['release'] } } } @@ -73,4 +75,5 @@ dependencies { annotationProcessor 'frankiesardo:icepick-processor:3.2.0' implementation 'com.github.livefront:bridge:v1.1.1' implementation files('libs/YouTubeAndroidPlayerApi.jar') + implementation 'com.github.javiersantos:AppUpdater:2.7' } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java index b188f2b8..69a05b23 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java @@ -31,6 +31,8 @@ import android.widget.EditText; import android.widget.ListView; import android.widget.TextView; +import com.github.javiersantos.appupdater.AppUpdater; +import com.github.javiersantos.appupdater.enums.UpdateFrom; import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -256,11 +258,20 @@ public class OnlineActivity extends CommonActivity { switchOfflineSuccess(); } else { checkTrial(false); + checkUpdates(); m_headlinesActionModeCallback = new HeadlinesActionModeCallback(); } } + protected void checkUpdates() { + if (BuildConfig.DEBUG || BuildConfig.ENABLE_UPDATER) { + new AppUpdater(this) + .setUpdateFrom(UpdateFrom.JSON) + .setUpdateJSON(String.format("https://srv.tt-rss.org/fdroid/updates/%1$s.json", this.getPackageName())) + .start(); + } + } protected void switchOffline() { AlertDialog.Builder builder = new AlertDialog.Builder(this) diff --git a/tt-rss-android.iml b/tt-rss-android.iml index 0e954cf4..a9a76d4a 100755 --- a/tt-rss-android.iml +++ b/tt-rss-android.iml @@ -8,10 +8,11 @@ </configuration>
</facet>
</component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
+ <excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
|