Removed versionNameSuffix from F-Droid flavor.

app/build.gradle

@@ -11,8 +11,8 @@ android {
         compileSdkVersion 29
         buildToolsVersion '29.0.2'
         useLibrary  'org.apache.http.legacy'
-        versionCode 97
+        versionCode 96
-        versionName "1.6.22"
+        versionName "1.6.21"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -42,14 +42,14 @@ android {
                             dimension "version"
 //                            applicationIdSuffix ".googlePlay"
                             versionNameSuffix "-googlePlay"
-                            targetSdkVersion 30
+                            targetSdkVersion 29
                         }
 
                 fdroidFlavor
                         {
                             dimension "version"
 //                            applicationIdSuffix ".fdroid"
-                            versionNameSuffix "-fdroid"
+//                            versionNameSuffix "-fdroid"
                             targetSdkVersion 28
                         }
 

app/googlePlayFlavor/release/output-metadata.json

@@ -1,18 +0,0 @@
-{
-  "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"
-    }
-  ]
-}

app/src/main/java/com/jens/automation2/ActivityPermissions.java

@@ -33,7 +33,6 @@ public class ActivityPermissions extends Activity
     public static final int requestCodeForPermissions = 12042;
     private static final int requestCodeForPermissionsWriteSettings = 12043;
     private static final int requestCodeForPermissionsNotificationPolicy = 12044;
-    private static final int requestCodeForPermissionsBackgroundLocation = 12045;
     protected String[] specificPermissionsToRequest = null;
 
     public static String intentExtraName = "permissionsToBeRequested";
@@ -769,16 +768,6 @@ public class ActivityPermissions extends Activity
                 }
             }
 
-            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
-            {
-                if (requestCode == requestCodeForPermissionsBackgroundLocation)
-                {
-                    NotificationManager mNotificationManager = (NotificationManager) ActivityPermissions.this.getSystemService(Context.NOTIFICATION_SERVICE);
-
-                    if (mNotificationManager.isNotificationPolicyAccessGranted())
-                        requestPermissions(cachedPermissionsToRequest, true);
-                }
-            }
         }
     }
 
@@ -838,15 +827,6 @@ 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;
-//                    }
                 }
             }
 

app/src/main/java/com/jens/automation2/News.java

@@ -10,8 +10,10 @@ 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;
@@ -70,7 +72,7 @@ public class News
 
         String filePath = context.getFilesDir() + "/appNews.xml";
 
-        if (!(new File(filePath)).exists() || Settings.lastNewsPolltime == -1 || now.getTimeInMillis() >= Settings.lastNewsPolltime + (long)(Settings.newsDisplayForXDays * 24 * 60 * 60 * 1000))
+        if (!(new File(filePath)).exists() || Settings.lastNewsPolltime == -1 || now.getTimeInMillis() >= Settings.lastNewsPolltime + (long)(Settings.pollNewsEveryXDays * 24 * 60 * 60 * 1000))
         {
             String newsUrl = "https://server47.de/automation/appNews.php";
             newsContent = Miscellaneous.downloadURL(newsUrl, null, null);
@@ -243,7 +245,7 @@ public class News
             try
             {
                 Calendar limit = Calendar.getInstance();
-                limit.add(Calendar.DAY_OF_MONTH, -Settings.newsPollEveryXDays);
+                limit.add(Calendar.DAY_OF_MONTH, -Settings.pollNewsEveryXDays);
                 return downloadNews(contexts[0], limit);
             }
             catch(Exception e)

app/src/main/java/com/jens/automation2/ReceiverCoordinator.java

@@ -56,7 +56,7 @@ public class ReceiverCoordinator
         }
         catch (ClassNotFoundException e)
         {
-//            e.printStackTrace();
+            e.printStackTrace();
 
             allImplementers = new Class[] {
                     AlarmListener.class,

app/src/main/java/com/jens/automation2/Settings.java

@@ -12,8 +12,7 @@ public class Settings implements SharedPreferences
 {
 	public static final int rulesThatHaveBeenRanHistorySize = 10;
 	public final static int lockSoundChangesInterval = 15;
-	public static final int newsPollEveryXDays = 3;
+	public static final int pollNewsEveryXDays = 7;
-	public static final int newsDisplayForXDays = 3;
 	public static final String folderName = "Automation";
 
 	public static long minimumDistanceChangeForGpsUpdate;