From d64f6e2c3b7b2d8a84fffca6a2e97506126dfd77 Mon Sep 17 00:00:00 2001 From: jens Date: Tue, 2 Mar 2021 19:55:43 +0100 Subject: [PATCH] News download finished. --- app/build.gradle | 6 +++--- .../release/output-metadata.json | 18 ++++++++++++++++++ .../jens/automation2/ActivityPermissions.java | 18 +++++++++--------- .../main/java/com/jens/automation2/News.java | 6 ++---- .../java/com/jens/automation2/Settings.java | 3 ++- 5 files changed, 34 insertions(+), 17 deletions(-) create mode 100644 app/googlePlayFlavor/release/output-metadata.json diff --git a/app/build.gradle b/app/build.gradle index c2ffeda..11e85e5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { compileSdkVersion 29 buildToolsVersion '29.0.2' useLibrary 'org.apache.http.legacy' - versionCode 96 - versionName "1.6.21" + versionCode 97 + versionName "1.6.22" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -42,7 +42,7 @@ android { dimension "version" // applicationIdSuffix ".googlePlay" versionNameSuffix "-googlePlay" - targetSdkVersion 29 + targetSdkVersion 30 } fdroidFlavor diff --git a/app/googlePlayFlavor/release/output-metadata.json b/app/googlePlayFlavor/release/output-metadata.json new file mode 100644 index 0000000..568eb61 --- /dev/null +++ b/app/googlePlayFlavor/release/output-metadata.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "com.jens.automation2", + "variantName": "processGooglePlayFlavorReleaseResources", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "versionCode": 97, + "versionName": "1.6.22-googlePlay", + "outputFile": "app-googlePlayFlavor-release.apk" + } + ] +} \ No newline at end of file diff --git a/app/src/main/java/com/jens/automation2/ActivityPermissions.java b/app/src/main/java/com/jens/automation2/ActivityPermissions.java index 3c6cc92..6ef14e1 100644 --- a/app/src/main/java/com/jens/automation2/ActivityPermissions.java +++ b/app/src/main/java/com/jens/automation2/ActivityPermissions.java @@ -838,15 +838,15 @@ public class ActivityPermissions extends Activity startActivityForResult(intent, requestCodeForPermissionsNotificationPolicy); return; } - else if (s.equalsIgnoreCase(permissionNameLocationBackground) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) - { - requiredPermissions.remove(s); - cachedPermissionsToRequest = requiredPermissions; - Intent intent = new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS); - intent.setData(Uri.parse("package:" + getPackageName())); - startActivityForResult(intent, requestCodeForPermissionsBackgroundLocation); - return; - } +// else if (s.equalsIgnoreCase(permissionNameLocationBackground) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) +// { +// requiredPermissions.remove(s); +// cachedPermissionsToRequest = requiredPermissions; +// Intent intent = new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS); +// intent.setData(Uri.parse("package:" + getPackageName())); +// startActivityForResult(intent, requestCodeForPermissionsBackgroundLocation); +// return; +// } } } diff --git a/app/src/main/java/com/jens/automation2/News.java b/app/src/main/java/com/jens/automation2/News.java index 12c89b2..58019dc 100644 --- a/app/src/main/java/com/jens/automation2/News.java +++ b/app/src/main/java/com/jens/automation2/News.java @@ -10,10 +10,8 @@ import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.xml.sax.SAXException; import java.io.File; -import java.lang.reflect.Array; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -72,7 +70,7 @@ public class News String filePath = context.getFilesDir() + "/appNews.xml"; - if (!(new File(filePath)).exists() || Settings.lastNewsPolltime == -1 || now.getTimeInMillis() >= Settings.lastNewsPolltime + (long)(Settings.pollNewsEveryXDays * 24 * 60 * 60 * 1000)) + if (!(new File(filePath)).exists() || Settings.lastNewsPolltime == -1 || now.getTimeInMillis() >= Settings.lastNewsPolltime + (long)(Settings.newsDisplayForXDays * 24 * 60 * 60 * 1000)) { String newsUrl = "https://server47.de/automation/appNews.php"; newsContent = Miscellaneous.downloadURL(newsUrl, null, null); @@ -245,7 +243,7 @@ public class News try { Calendar limit = Calendar.getInstance(); - limit.add(Calendar.DAY_OF_MONTH, -Settings.pollNewsEveryXDays); + limit.add(Calendar.DAY_OF_MONTH, -Settings.newsPollEveryXDays); return downloadNews(contexts[0], limit); } catch(Exception e) diff --git a/app/src/main/java/com/jens/automation2/Settings.java b/app/src/main/java/com/jens/automation2/Settings.java index 15af4d1..39e0271 100644 --- a/app/src/main/java/com/jens/automation2/Settings.java +++ b/app/src/main/java/com/jens/automation2/Settings.java @@ -12,7 +12,8 @@ public class Settings implements SharedPreferences { public static final int rulesThatHaveBeenRanHistorySize = 10; public final static int lockSoundChangesInterval = 15; - public static final int pollNewsEveryXDays = 7; + public static final int newsPollEveryXDays = 3; + public static final int newsDisplayForXDays = 3; public static final String folderName = "Automation"; public static long minimumDistanceChangeForGpsUpdate;