Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-03 23:56:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added announcement properties

Browse Source
This commit is contained in:
M66B
2023-01-18 09:20:03 +01:00
parent c7a8855cd7
commit a026a6221e
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@@ -1816,8 +1816,12 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
Announcement announcement = new Announcement();
announcement.id = jannouncement.getInt("ID");
announcement.test = jannouncement.optBoolean("Test");
announcement.play = jannouncement.optBoolean("Play", false);
announcement.fdroid = jannouncement.optBoolean("FDroid", true);
announcement.title = title;
announcement.text = HtmlHelper.fromHtml(text, context);
announcement.minVersion = jannouncement.optInt("minVersion", 0);
announcement.maxVersion = jannouncement.optInt("maxVersion", BuildConfig.VERSION_CODE);
if (jannouncement.has("Link"))
announcement.link = Uri.parse(jannouncement.getString("Link"));
announcement.expires = DTF.parse(jannouncement.getString("Expires")
@@ -2459,14 +2463,24 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
private class Announcement {
int id;
boolean test;
boolean play;
boolean fdroid;
String title;
Spanned text;
int minVersion;
int maxVersion;
Uri link;
Date expires;
boolean isExpired() {
if (this.test && !BuildConfig.DEBUG)
return true;
if (this.play && !BuildConfig.PLAY_STORE_RELEASE)
return true;
if (this.fdroid && !BuildConfig.FDROID_RELEASE)
return true;
if (this.minVersion > BuildConfig.VERSION_CODE || BuildConfig.VERSION_CODE > this.maxVersion)
return true;
if (expires == null)
return true;
return (expires.getTime() < new Date().getTime());