add tests for /preview/* routes

- SearchMessageFTSMulti
 - ListMessagesFilteredChannels
 - ListMessagesFilteredChannelIDs
 - ListMessagesFilteredSenders
 - ListMessagesFilteredTime
 - ListMessagesFilteredPriority
 - ListMessagesFilteredKeyTokens

.gitea/workflows/build_and_deploy.yml

@@ -0,0 +1,43 @@
+
+# https://docs.gitea.com/next/usage/actions/quickstart
+# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
+# https://docs.github.com/en/actions/learn-github-actions/contexts#github-context
+
+name: Build Docker and Deploy
+run-name: Build & Deploy ${{ gitea.ref }} on ${{ gitea.actor }}
+
+on: 
+  push:
+    branches: ['master']    
+
+
+
+jobs:
+  build_job:
+    name: Build Docker Container
+    runs-on: bfb-cicd-latest
+    steps:
+      - run: echo -n "${{ secrets.DOCKER_REG_PASS }}" | docker login registry.blackforestbytes.com -u docker --password-stdin
+      - name: Check out code
+        uses: actions/checkout@v3
+      - run: cd "${{ gitea.workspace }}/scnserver" && make clean
+      - run: cd "${{ gitea.workspace }}/scnserver" && make docker
+      - run: cd "${{ gitea.workspace }}/scnserver" && make push-docker
+    
+  deploy_job:
+    name: Deploy to Server
+    needs: [build_job]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Execute deploy on remote (via ssh)
+        uses: appleboy/ssh-action@v1.0.0
+        with:
+          host:     simplecloudnotifier.de
+          username: bfb-deploy-bot
+          port:     4477
+          key:      "${{ secrets.SSH_KEY_BFBDEPLOYBOT }}"
+          script:   cd /var/docker/deploy-scripts/simplecloudnotifier && ./deploy.sh master "${{ gitea.sha }}" || exit 1
+
+
+
+

android/.idea/assetWizardSettings.xml

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="WizardSettings">
-    <option name="children">
-      <map>
-        <entry key="imageWizard">
-          <value>
-            <PersistentState>
-              <option name="children">
-                <map>
-                  <entry key="imageAssetPanel">
-                    <value>
-                      <PersistentState>
-                        <option name="children">
-                          <map>
-                            <entry key="launcherLegacy">
-                              <value>
-                                <PersistentState>
-                                  <option name="values">
-                                    <map>
-                                      <entry key="assetType" value="IMAGE" />
-                                      <entry key="cropped" value="true" />
-                                      <entry key="iconShape" value="NONE" />
-                                      <entry key="imageAsset" value="F:\Eigene Dateien\Dropbox\Programming\Java\AndroidStudioProjects\SimpleCloudNotifier\data\icon_512_nobox.png" />
-                                      <entry key="outputName" value="ic_notification_full" />
-                                    </map>
-                                  </option>
-                                </PersistentState>
-                              </value>
-                            </entry>
-                            <entry key="notification">
-                              <value>
-                                <PersistentState>
-                                  <option name="values">
-                                    <map>
-                                      <entry key="assetType" value="IMAGE" />
-                                      <entry key="imageAsset" value="F:\Eigene Dateien\Dropbox\Programming\Java\AndroidStudioProjects\SimpleCloudNotifier\data\icon_512_transparent.png" />
-                                      <entry key="outputName" value="ic_notification_white" />
-                                    </map>
-                                  </option>
-                                </PersistentState>
-                              </value>
-                            </entry>
-                          </map>
-                        </option>
-                        <option name="values">
-                          <map>
-                            <entry key="outputIconType" value="LAUNCHER_LEGACY" />
-                          </map>
-                        </option>
-                      </PersistentState>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </PersistentState>
-          </value>
-        </entry>
-        <entry key="vectorWizard">
-          <value>
-            <PersistentState>
-              <option name="children">
-                <map>
-                  <entry key="vectorAssetStep">
-                    <value>
-                      <PersistentState>
-                        <option name="values">
-                          <map>
-                            <entry key="assetSourceType" value="FILE" />
-                            <entry key="outputName" value="ic_garbage" />
-                            <entry key="sourceFile" value="C:\Users\Mike\Downloads\garbage.svg" />
-                          </map>
-                        </option>
-                      </PersistentState>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </PersistentState>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>

android/.idea/codeStyles/Project.xml

@@ -1,29 +1,113 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
+    <codeStyleSettings language="XML">
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
   </code_scheme>
 </component>

android/.idea/deploymentTargetDropDown.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <value>
+      <entry key="app">
+        <State />
+      </entry>
+    </value>
+  </component>
+</project>

android/.idea/jarRepositories.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://dl.bintray.com/gericop/maven" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="https://maven.google.com" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>

android/.idea/migrations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>

android/.idea/runConfigurations.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

android/app/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     def versionPropsFile = file('version.properties')
     def vNumber
@@ -16,7 +16,7 @@ android {
     defaultConfig {
         applicationId "com.blackforestbytes.simplecloudnotifier"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode vNumber
         versionName vName
     }
@@ -35,76 +35,82 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 
-    implementation 'com.google.android.material:material:1.0.0'
-    implementation 'com.google.firebase:firebase-core:16.0.4'
-    implementation 'com.google.firebase:firebase-messaging:17.3.4'
-    implementation 'com.google.android.gms:play-services-ads:17.1.0'
-    implementation 'com.android.billingclient:billing:1.2'
+    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.firebase:firebase-core:18.0.0'
+    implementation 'com.google.firebase:firebase-messaging:21.0.0'
+    implementation 'com.google.android.gms:play-services-ads:19.5.0'
+    implementation 'com.android.billingclient:billing:3.0.1'
 
-    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     implementation 'com.github.kenglxn.QRGen:android:2.5.0'
     implementation "com.github.DeweyReed:UltimateMusicPicker:2.0.0"
     implementation 'com.github.duanhong169:colorpicker:1.1.5'
+
+    implementation 'net.danlew:android.joda:2.10.7.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
 
-task updateVersion << {
-    def lastTag = ['git', 'describe', "--abbrev=0", "--tags"].execute().text.trim()
+tasks.register("updateVersion") {
+    group = 'Custom'
 
-    def versionPropsFile = file('version.properties')
-    if (!versionPropsFile.canRead()) throw new FileNotFoundException("Could not read version.properties!")
-    Properties versionProps = new Properties()
-    new FileInputStream(versionPropsFile).withCloseable { fis -> versionProps.load(fis) }
+    doLast {
+        def lastTag = ['git', 'describe', "--abbrev=0", "--tags"].execute().text.trim()
 
-    def matcher = lastTag =~ /^v([0-9]+)\.([0-9]+)\.([0-9]+)$/
+        def versionPropsFile = file('version.properties')
+        if (!versionPropsFile.canRead()) throw new FileNotFoundException("Could not read version.properties!")
+        Properties versionProps = new Properties()
+        new FileInputStream(versionPropsFile).withCloseable { fis -> versionProps.load(fis) }
 
-    if (!matcher.matches()) throw new Exception("Last Tag ('" + lastTag + "') has invalid format :(")
+        def matcher = lastTag =~ /^v([0-9]+)\.([0-9]+)\.([0-9]+)$/
 
-    def vName = (matcher[0][1] as Integer) + "." + (matcher[0][2] as Integer) + "." + (matcher[0][3] as Integer)
-    def vCode = versionProps['VERSION_CODE'] as Integer
+        if (!matcher.matches()) throw new Exception("Last Tag ('" + lastTag + "') has invalid format :(")
 
-    if (new File(".do_publish_beta_release").exists()) new File(".do_publish_beta_release").delete()
-    if (new File(".do_publish_prod_release").exists()) new File(".do_publish_prod_release").delete()
+        def vName = (matcher[0][1] as Integer) + "." + (matcher[0][2] as Integer) + "." + (matcher[0][3] as Integer)
+        def vCode = versionProps['VERSION_CODE'] as Integer
 
-    if (vName == versionProps['VERSION_NAME'].toString()) {
-        println "This version was already built - skip deployment"
-    } else if (vName.endsWith(".0")) {
-        println ""
-        println "====================================================================="
-        println "====================================================================="
-        println "(!) This is a new PRODUCTION release - create deployment trigger file"
-        println "====================================================================="
-        println "====================================================================="
-        println ""
+        if (new File(".do_publish_beta_release").exists()) new File(".do_publish_beta_release").delete()
+        if (new File(".do_publish_prod_release").exists()) new File(".do_publish_prod_release").delete()
 
-        vCode++
-        new File(".do_publish_prod_release").createNewFile()
+        if (vName == versionProps['VERSION_NAME'].toString()) {
+            println "This version was already built - skip deployment"
+        } else if (vName.endsWith(".0")) {
+            println ""
+            println "====================================================================="
+            println "====================================================================="
+            println "(!) This is a new PRODUCTION release - create deployment trigger file"
+            println "====================================================================="
+            println "====================================================================="
+            println ""
 
-        versionProps['VERSION_NAME'] = vName.toString()
-        versionProps['VERSION_CODE'] = vCode.toString()
+            vCode++
+            new File(".do_publish_prod_release").createNewFile()
 
-        versionPropsFile.newWriter().withCloseable { w -> versionProps.store(w, null) }
-    } else {
-        println ""
-        println "==============================================================="
-        println "(!) This is a new beta release - create deployment trigger file"
-        println "==============================================================="
-        println ""
+            versionProps['VERSION_NAME'] = vName.toString()
+            versionProps['VERSION_CODE'] = vCode.toString()
 
-        vCode++
-        new File(".do_publish_beta_release").createNewFile()
+            versionPropsFile.newWriter().withCloseable { w -> versionProps.store(w, null) }
+        } else {
+            println ""
+            println "==============================================================="
+            println "(!) This is a new beta release - create deployment trigger file"
+            println "==============================================================="
+            println ""
 
-        versionProps['VERSION_NAME'] = vName.toString()
-        versionProps['VERSION_CODE'] = vCode.toString()
+            vCode++
+            new File(".do_publish_beta_release").createNewFile()
 
-        versionPropsFile.newWriter().withCloseable { w -> versionProps.store(w, null) }
+            versionProps['VERSION_NAME'] = vName.toString()
+            versionProps['VERSION_CODE'] = vCode.toString()
+
+            versionPropsFile.newWriter().withCloseable { w -> versionProps.store(w, null) }
+        }
     }
 }

android/app/src/main/AndroidManifest.xml

@@ -1,43 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.blackforestbytes.simplecloudnotifier">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="com.android.vending.BILLING" />
 
     <application
+        android:name=".SCNApp"
         android:allowBackup="false"
-        android:name="SCNApp"
         android:icon="@drawable/icon"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
-
         <activity android:name=".view.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <meta-data android:name="com.google.firebase.messaging.default_notification_icon"  android:resource="@drawable/icon" />
-        <meta-data android:name="com.google.firebase.messaging.default_notification_color" android:resource="@color/colorAccent" />
-        <meta-data android:name="com.google.android.gms.ads.AD_MANAGER_APP"                android:value="true"/>
-        <meta-data android:name="com.google.android.gms.ads.APPLICATION_ID"                android:value="ca-app-pub-3320562328966175~7579972005"/>
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="com.blackforestbytes.simplecloudnotifier.fileprovider"
+            android:grantUriPermissions="true"
+            android:exported="false">
+            <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/filepaths" />
+        </provider>
 
-        <service android:name=".service.FBMService" android:exported="false">
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/icon" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_color"
+            android:resource="@color/colorAccent" />
+        <meta-data
+            android:name="com.google.android.gms.ads.AD_MANAGER_APP"
+            android:value="true" />
+        <meta-data
+            android:name="com.google.android.gms.ads.APPLICATION_ID"
+            android:value="ca-app-pub-3320562328966175~7579972005" />
+
+        <service
+            android:name=".service.FBMService"
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
 
-        <receiver android:name=".service.BroadcastReceiverService" android:exported="false" />
+        <receiver
+            android:name=".service.BroadcastReceiverService"
+            android:exported="false" />
 
+        <activity
+            android:name=".view.debug.QueryLogActivity"
+            android:label="@string/title_activity_query_log"
+            android:theme="@style/AppTheme" />
+        <activity android:name=".view.debug.SingleQueryLogActivity" />
     </application>
 
 </manifest>

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/SCNApp.java

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.widget.Toast;
 
 import com.android.billingclient.api.BillingClient;
+import com.blackforestbytes.simplecloudnotifier.model.QueryLog;
 import com.blackforestbytes.simplecloudnotifier.view.AccountFragment;
 import com.blackforestbytes.simplecloudnotifier.view.MainActivity;
 import com.blackforestbytes.simplecloudnotifier.view.TabAdapter;
@@ -98,3 +99,6 @@ public class SCNApp extends Application implements LifecycleObserver
         isBackground = false;
     }
 }
+
+//TODO: Config for collapsed line count
+//TODO: Sometimes ads but promode

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/CMessage.java

@@ -9,6 +9,8 @@ import java.util.TimeZone;
 
 public class CMessage
 {
+    public boolean IsExpandedInAdapter = false;
+
     public final long SCN_ID;
     public final long Timestamp;
     public final String Title;

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/CMessageList.java

@@ -35,6 +35,11 @@ public class CMessageList
     }
 
     private CMessageList()
+    {
+        reloadPrefs();
+    }
+
+    public void reloadPrefs()
     {
         synchronized (msg_lock)
         {

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/LogLevel.java

@@ -0,0 +1,58 @@
+package com.blackforestbytes.simplecloudnotifier.model;
+
+
+import android.graphics.Color;
+
+public enum LogLevel
+{
+    DEBUG,
+    INFO,
+    WARN,
+    ERROR;
+
+    public String toUIString()
+    {
+        switch (this)
+        {
+            case DEBUG: return "Debug";
+            case INFO:  return "Info";
+            case WARN:  return "Warning";
+            case ERROR: return "Error";
+            default:    return "???";
+        }
+    }
+
+    public int getColor()
+    {
+        switch (this)
+        {
+            case DEBUG: return Color.GRAY;
+            case WARN:  return Color.rgb(171, 145, 68);
+            case INFO:  return Color.BLACK;
+            case ERROR: return Color.RED;
+            default:    return Color.MAGENTA;
+        }
+    }
+
+    public int asInt()
+    {
+        switch (this)
+        {
+            case DEBUG: return 0;
+            case WARN:  return 1;
+            case INFO:  return 2;
+            case ERROR: return 3;
+            default:    return 999;
+        }
+    }
+
+    public static LogLevel fromInt(int i)
+    {
+        if (i == 0) return LogLevel.DEBUG;
+        if (i == 1) return LogLevel.WARN;
+        if (i == 2) return LogLevel.INFO;
+        if (i == 3) return LogLevel.ERROR;
+
+        return LogLevel.ERROR; // ????
+    }
+}

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/QueryLog.java

@@ -0,0 +1,69 @@
+package com.blackforestbytes.simplecloudnotifier.model;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.util.Log;
+
+import com.blackforestbytes.simplecloudnotifier.SCNApp;
+import com.blackforestbytes.simplecloudnotifier.lib.collections.CollectionHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class QueryLog
+{
+    private final static int MAX_HISTORY_SIZE = 192;
+
+    private static QueryLog _instance;
+    public static QueryLog inst() { if (_instance == null) synchronized (QueryLog.class) { if (_instance == null) _instance = new QueryLog(); } return _instance; }
+
+    private QueryLog(){ reloadPrefs(); }
+
+    private final List<SingleQuery> history = new ArrayList<>();
+
+    public synchronized void add(SingleQuery r)
+    {
+        history.add(r);
+        while (history.size() > MAX_HISTORY_SIZE) history.remove(0);
+
+        save();
+    }
+
+    public synchronized List<SingleQuery> get()
+    {
+        List<SingleQuery> r = new ArrayList<>(history);
+        CollectionHelper.sort_inplace(r, (o1, o2) -> (-1) * o1.Timestamp.compareTo(o2.Timestamp));
+        return r;
+    }
+
+    public synchronized void save()
+    {
+        SharedPreferences sharedPref = SCNApp.getContext().getSharedPreferences("QueryLog", Context.MODE_PRIVATE);
+        SharedPreferences.Editor e = sharedPref.edit();
+
+        e.clear();
+
+        e.putInt("history_count", history.size());
+
+        for (int i = 0; i < history.size(); i++) history.get(i).save(e, "message["+(i+1000)+"]");
+
+        e.apply();
+    }
+
+    public synchronized void reloadPrefs()
+    {
+        try
+        {
+            Context c = SCNApp.getContext();
+            SharedPreferences sharedPref = c.getSharedPreferences("QueryLog", Context.MODE_PRIVATE);
+            int count = sharedPref.getInt("history_count", 0);
+            for (int i=0; i < count; i++) history.add(SingleQuery.load(sharedPref, "message["+(i+1000)+"]"));
+
+            CollectionHelper.sort_inplace(history, (o1, o2) -> (-1) * o1.Timestamp.compareTo(o2.Timestamp));
+        }
+        catch (Exception e)
+        {
+            Log.e("SC:QL:Load", e.toString());
+        }
+    }
+}

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/SCNSettings.java

@@ -6,11 +6,11 @@ import android.content.SharedPreferences;
 import android.util.Log;
 import android.view.View;
 
-import com.android.billingclient.api.Purchase;
 import com.blackforestbytes.simplecloudnotifier.SCNApp;
+import com.blackforestbytes.simplecloudnotifier.lib.datatypes.Tuple3;
 import com.blackforestbytes.simplecloudnotifier.lib.string.Str;
 import com.blackforestbytes.simplecloudnotifier.service.IABService;
-import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.installations.FirebaseInstallations;
 
 public class SCNSettings
 {
@@ -52,7 +52,8 @@ public class SCNSettings
 
     public boolean Enabled = true;
     public int LocalCacheSize = 500;
-    public boolean EnableDeleteSwipe = true;
+    public boolean EnableDeleteSwipe = false;
+    public int PreviewLineCount = 6;
 
     public final NotificationSettings PriorityLow  = new NotificationSettings(PriorityEnum.LOW);
     public final NotificationSettings PriorityNorm = new NotificationSettings(PriorityEnum.NORMAL);
@@ -61,6 +62,11 @@ public class SCNSettings
     // ------------------------------------------------------------
 
     public SCNSettings()
+    {
+        reloadPrefs();
+    }
+
+    public void reloadPrefs()
     {
         SharedPreferences sharedPref = SCNApp.getContext().getSharedPreferences("Config", Context.MODE_PRIVATE);
 
@@ -77,6 +83,7 @@ public class SCNSettings
         Enabled                     = sharedPref.getBoolean("app_enabled",  Enabled);
         LocalCacheSize              = sharedPref.getInt("local_cache_size", LocalCacheSize);
         EnableDeleteSwipe           = sharedPref.getBoolean("do_del_swipe",  EnableDeleteSwipe);
+        PreviewLineCount            = sharedPref.getInt("preview_line_count", PreviewLineCount);
 
         PriorityLow.EnableLED         = sharedPref.getBoolean("priority_low:enabled_led",         PriorityLow.EnableLED);
         PriorityLow.EnableSound       = sharedPref.getBoolean("priority_low:enabled_sound",       PriorityLow.EnableSound);
@@ -120,10 +127,14 @@ public class SCNSettings
         e.putString( "user_key",                         user_key);
         e.putString( "fcm_token_local",                  fcm_token_local);
         e.putString( "fcm_token_server",                 fcm_token_server);
+        e.putBoolean("promode_local",                    promode_local);
+        e.putBoolean("promode_server",                   promode_server);
+        e.putString( "promode_token",                    promode_token);
 
         e.putBoolean("app_enabled",                      Enabled);
         e.putInt(    "local_cache_size",                 LocalCacheSize);
         e.putBoolean("do_del_swipe",                     EnableDeleteSwipe);
+        e.putInt(    "preview_line_count",               PreviewLineCount);
 
         e.putBoolean("priority_low:enabled_led",         PriorityLow.EnableLED);
         e.putBoolean("priority_low:enabled_sound",       PriorityLow.EnableSound);
@@ -171,13 +182,13 @@ public class SCNSettings
         return base + "index.php?preset_user_id="+user_id+"&preset_user_key="+user_key;
     }
 
-    public void setServerToken(String token, View loader)
+    public void setServerToken(String token, View loader, boolean force)
     {
         if (isConnected())
         {
             fcm_token_local = token;
             save();
-            if (!fcm_token_local.equals(fcm_token_server)) ServerCommunication.updateFCMToken(user_id, user_key, fcm_token_local, loader);
+            if (!fcm_token_local.equals(fcm_token_server) || force) ServerCommunication.updateFCMToken(user_id, user_key, fcm_token_local, loader);
         }
         else
         {
@@ -189,13 +200,12 @@ public class SCNSettings
     }
 
     // called at app start
-    public void work(Activity a)
+    public void work(Activity a, boolean force)
     {
-        FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(a, instanceIdResult ->
+        FirebaseInstallations.getInstance().getId().addOnSuccessListener(a, newToken ->
         {
-            String newToken = instanceIdResult.getToken();
             Log.d("FB::GetInstanceId", newToken);
-            SCNSettings.inst().setServerToken(newToken, null);
+            SCNSettings.inst().setServerToken(newToken, null, force);
         }).addOnCompleteListener(r ->
         {
             if (isConnected()) ServerCommunication.info(user_id, user_key, null);
@@ -221,16 +231,15 @@ public class SCNSettings
 
             if (promode_server != promode_local) updateProState(loader);
 
-            if (!Str.equals(fcm_token_local, fcm_token_server)) work(a);
+            if (!Str.equals(fcm_token_local, fcm_token_server)) work(a, false);
         }
         else
         {
             // get token then register
-            FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(a, instanceIdResult ->
+            FirebaseInstallations.getInstance().getId().addOnSuccessListener(a, newToken ->
             {
-                String newToken = instanceIdResult.getToken();
                 Log.d("FB::GetInstanceId", newToken);
-                SCNSettings.inst().setServerToken(newToken, loader); // does register in here
+                SCNSettings.inst().setServerToken(newToken, loader, false); // does register in here
             }).addOnCompleteListener(r ->
             {
                 if (isConnected()) ServerCommunication.info(user_id, user_key, null); // info again for safety
@@ -240,14 +249,17 @@ public class SCNSettings
 
     public void updateProState(View loader)
     {
-        Purchase purch = IABService.inst().getPurchaseCached(IABService.IAB_PRO_MODE);
-        boolean promode_real = (purch != null);
+        Tuple3<Boolean, Boolean, String> state = IABService.inst().getPurchaseCachedExtended(IABService.IAB_PRO_MODE);
+        if (!state.Item2) return; // not initialized
+
+        boolean promode_real = state.Item1;
 
         if (promode_real != promode_local || promode_real != promode_server)
         {
             promode_local = promode_real;
+            promode_token = promode_real ? state.Item3 : "";
+            save();
 
-            promode_token = promode_real ? purch.getPurchaseToken() : "";
             updateProStateOnServer(loader);
         }
     }

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/ServerCommunication.java

@@ -4,12 +4,11 @@ import android.util.Log;
 import android.view.View;
 
 import com.blackforestbytes.simplecloudnotifier.SCNApp;
-import com.blackforestbytes.simplecloudnotifier.lib.datatypes.Tuple5;
-import com.blackforestbytes.simplecloudnotifier.lib.lambda.Func1to0;
 import com.blackforestbytes.simplecloudnotifier.lib.lambda.Func5to0;
 import com.blackforestbytes.simplecloudnotifier.lib.string.Str;
 import com.blackforestbytes.simplecloudnotifier.service.FBMService;
 
+import org.joda.time.Instant;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -48,20 +47,20 @@ public class ServerCommunication
                 @Override
                 public void onFailure(Call call, IOException e)
                 {
-                    Log.e("SC:register", e.toString());
-                    SCNApp.showToast("Communication with server failed", 4000);
+                    handleError("register", call, null, Str.Empty, true, e);
                     SCNApp.runOnUiThread(() -> { if (loader!=null)loader.setVisibility(View.GONE); });
                 }
 
                 @Override
                 public void onResponse(Call call, Response response)
                 {
+                    String r = Str.Empty;
                     try (ResponseBody responseBody = response.body())
                     {
                         if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
                         if (responseBody ==  null) throw new IOException("No response");
 
-                        String r = responseBody.string();
+                        r = responseBody.string();
                         Log.d("Server::Response", request.url().toString()+"\n"+r);
 
                         JSONObject json = (JSONObject) new JSONTokener(r).nextValue();
@@ -69,6 +68,7 @@ public class ServerCommunication
                         if (!json_bool(json, "success"))
                         {
                             SCNApp.showToast(json_str(json, "message"), 4000);
+                            handleNonSuccess("register", call, response, r);
                             return;
                         }
 
@@ -81,11 +81,12 @@ public class ServerCommunication
                         SCNSettings.inst().save();
 
                         SCNApp.refreshAccountTab();
+
+                        handleSuccess("register", call, response, r);
                     }
                     catch (Exception e)
                     {
-                        Log.e("SC:register", e.toString());
-                        SCNApp.showToast("Communication with server failed", 4000);
+                        handleError("register", call, response, r, false, e);
                     }
                     finally
                     {
@@ -96,8 +97,7 @@ public class ServerCommunication
         }
         catch (Exception e)
         {
-            Log.e("SC:register", e.toString());
-            SCNApp.showToast("Communication with server failed", 4000);
+            handleError("register", null, null, Str.Empty, false, e);
         }
     }
 
@@ -106,7 +106,7 @@ public class ServerCommunication
         try
         {
             Request request = new Request.Builder()
-                    .url(BASE_URL + "updateFCMToken.php?user_id="+id+"&user_key="+key+"&fcm_token="+token)
+                    .url(BASE_URL + "update.php?user_id="+id+"&user_key="+key+"&fcm_token="+token)
                     .build();
 
             client.newCall(request).enqueue(new Callback()
@@ -114,20 +114,20 @@ public class ServerCommunication
                 @Override
                 public void onFailure(Call call, IOException e)
                 {
-                    Log.e("SC:update_1", e.toString());
-                    SCNApp.showToast("Communication with server failed", 4000);
+                    handleError("update<1>", call, null, Str.Empty, true, e);
                     SCNApp.runOnUiThread(() -> { if (loader!=null)loader.setVisibility(View.GONE); });
                 }
 
                 @Override
                 public void onResponse(Call call, Response response)
                 {
+                    String r = Str.Empty;
                     try (ResponseBody responseBody = response.body())
                     {
                         if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
                         if (responseBody ==  null) throw new IOException("No response");
 
-                        String r = responseBody.string();
+                        r = responseBody.string();
                         Log.d("Server::Response", request.url().toString()+"\n"+r);
 
                         JSONObject json = (JSONObject) new JSONTokener(r).nextValue();
@@ -135,6 +135,7 @@ public class ServerCommunication
                         if (!json_bool(json, "success"))
                         {
                             SCNApp.showToast(json_str(json, "message"), 4000);
+                            handleNonSuccess("update<1>", call, response, r);
                             return;
                         }
 
@@ -147,10 +148,12 @@ public class ServerCommunication
                         SCNSettings.inst().save();
 
                         SCNApp.refreshAccountTab();
+
+                        handleSuccess("update<1>", call, response, r);
                     }
                     catch (Exception e)
                     {
-                        Log.e("SC:update_1", e.toString());
+                        handleError("update<1>", call, response, r, false, e);
                         SCNApp.showToast("Communication with server failed", 4000);
                     }
                     finally
@@ -162,8 +165,7 @@ public class ServerCommunication
         }
         catch (Exception e)
         {
-            Log.e("SC:update_1", e.toString());
-            SCNApp.showToast("Communication with server failed", 4000);
+            handleError("update<1>", null, null, Str.Empty, false, e);
         }
     }
 
@@ -172,30 +174,35 @@ public class ServerCommunication
         try
         {
             Request request = new Request.Builder()
-                    .url(BASE_URL + "updateFCMToken.php?user_id=" + id + "&user_key=" + key)
+                    .url(BASE_URL + "update.php?user_id=" + id + "&user_key=" + key)
                     .build();
 
             client.newCall(request).enqueue(new Callback() {
                 @Override
-                public void onFailure(Call call, IOException e) {
-                    Log.e("SC:update_2", e.toString());
+                public void onFailure(Call call, IOException e)
+                {
+                    handleError("update<1>", call, null, Str.Empty, true, e);
                     SCNApp.showToast("Communication with server failed", 4000);
                 }
 
                 @Override
-                public void onResponse(Call call, Response response) {
-                    try (ResponseBody responseBody = response.body()) {
+                public void onResponse(Call call, Response response)
+                {
+                    String r = Str.Empty;
+                    try (ResponseBody responseBody = response.body())
+                    {
                         if (!response.isSuccessful())
                             throw new IOException("Unexpected code " + response);
                         if (responseBody == null) throw new IOException("No response");
 
-                        String r = responseBody.string();
+                        r = responseBody.string();
                         Log.d("Server::Response", request.url().toString()+"\n"+r);
 
                         JSONObject json = (JSONObject) new JSONTokener(r).nextValue();
 
                         if (!json_bool(json, "success")) {
                             SCNApp.showToast(json_str(json, "message"), 4000);
+                            handleNonSuccess("update<2>", call, response, r);
                             return;
                         }
 
@@ -207,10 +214,16 @@ public class ServerCommunication
                         SCNSettings.inst().save();
 
                         SCNApp.refreshAccountTab();
-                    } catch (Exception e) {
-                        Log.e("SC:update_2", e.toString());
+
+                        handleSuccess("update<2>", call, response, r);
+                    }
+                    catch (Exception e)
+                    {
+                        handleError("update<2>", call, response, r, false, e);
                         SCNApp.showToast("Communication with server failed", 4000);
-                    } finally {
+                    }
+                    finally
+                    {
                         SCNApp.runOnUiThread(() -> {
                             if (loader != null) loader.setVisibility(View.GONE);
                         });
@@ -220,8 +233,7 @@ public class ServerCommunication
         }
         catch (Exception e)
         {
-            Log.e("SC:update_2", e.toString());
-            SCNApp.showToast("Communication with server failed", 4000);
+            handleError("update<2>", null, null, Str.Empty, false, e);
         }
     }
 
@@ -236,21 +248,23 @@ public class ServerCommunication
             client.newCall(request).enqueue(new Callback() {
                 @Override
                 public void onFailure(Call call, IOException e) {
-                    Log.e("SC:info", e.toString());
-                    SCNApp.showToast("Communication with server failed", 4000);
+                    handleError("info", call, null, Str.Empty, true, e);
                     SCNApp.runOnUiThread(() -> {
                         if (loader != null) loader.setVisibility(View.GONE);
                     });
                 }
 
                 @Override
-                public void onResponse(Call call, Response response) {
-                    try (ResponseBody responseBody = response.body()) {
+                public void onResponse(Call call, Response response)
+                {
+                    String r = Str.Empty;
+                    try (ResponseBody responseBody = response.body())
+                    {
                         if (!response.isSuccessful())
                             throw new IOException("Unexpected code " + response);
                         if (responseBody == null) throw new IOException("No response");
 
-                        String r = responseBody.string();
+                        r = responseBody.string();
                         Log.d("Server::Response", request.url().toString()+"\n"+r);
 
                         JSONObject json = (JSONObject) new JSONTokener(r).nextValue();
@@ -258,6 +272,7 @@ public class ServerCommunication
                         if (!json_bool(json, "success"))
                         {
                             SCNApp.showToast(json_str(json, "message"), 4000);
+                            handleNonSuccess("info", call, response, r);
 
                             int errid = json.optInt("errid", 0);
 
@@ -290,21 +305,23 @@ public class ServerCommunication
 
                         if (json_int(json, "unack_count")>0) ServerCommunication.requery(id, key, loader);
 
-                    } catch (Exception e) {
-                        Log.e("SC:info", e.toString());
+                        handleSuccess("info", call, response, r);
+                    }
+                    catch (Exception e)
+                    {
+                        handleError("info", call, response, r, false, e);
                         SCNApp.showToast("Communication with server failed", 4000);
-                    } finally {
-                        SCNApp.runOnUiThread(() -> {
-                            if (loader != null) loader.setVisibility(View.GONE);
-                        });
+                    }
+                    finally
+                    {
+                        SCNApp.runOnUiThread(() -> { if (loader != null) loader.setVisibility(View.GONE); });
                     }
                 }
             });
         }
         catch (Exception e)
         {
-            Log.e("SC:info", e.toString());
-            SCNApp.showToast("Communication with server failed", 4000);
+            handleError("info", null, null, Str.Empty, false, e);
         }
     }
 
@@ -319,21 +336,23 @@ public class ServerCommunication
             client.newCall(request).enqueue(new Callback() {
                 @Override
                 public void onFailure(Call call, IOException e) {
-                    Log.e("SC:requery", e.toString());
-                    SCNApp.showToast("Communication with server failed", 4000);
+                    handleError("requery", call, null, Str.Empty, true, e);
                     SCNApp.runOnUiThread(() -> {
                         if (loader != null) loader.setVisibility(View.GONE);
                     });
                 }
 
                 @Override
-                public void onResponse(Call call, Response response) {
-                    try (ResponseBody responseBody = response.body()) {
+                public void onResponse(Call call, Response response)
+                {
+                    String r = Str.Empty;
+                    try (ResponseBody responseBody = response.body())
+                    {
                         if (!response.isSuccessful())
                             throw new IOException("Unexpected code " + response);
                         if (responseBody == null) throw new IOException("No response");
 
-                        String r = responseBody.string();
+                        r = responseBody.string();
                         Log.d("Server::Response", request.url().toString()+"\n"+r);
 
                         JSONObject json = (JSONObject) new JSONTokener(r).nextValue();
@@ -341,6 +360,7 @@ public class ServerCommunication
                         if (!json_bool(json, "success"))
                         {
                             SCNApp.showToast(json_str(json, "message"), 4000);
+                            handleNonSuccess("requery", call, response, r);
                             return;
                         }
 
@@ -359,10 +379,15 @@ public class ServerCommunication
                             FBMService.recieveData(time, title, content, prio, scn_id, true);
                         }
 
-                    } catch (Exception e) {
-                        Log.e("SC:info", e.toString());
+                        handleSuccess("requery", call, response, r);
+                    }
+                    catch (Exception e)
+                    {
+                        handleError("requery", call, response, r, false, e);
                         SCNApp.showToast("Communication with server failed", 4000);
-                    } finally {
+                    }
+                    finally
+                    {
                         SCNApp.runOnUiThread(() -> {
                             if (loader != null) loader.setVisibility(View.GONE);
                         });
@@ -372,8 +397,7 @@ public class ServerCommunication
         }
         catch (Exception e)
         {
-            Log.e("SC:requery", e.toString());
-            SCNApp.showToast("Communication with server failed", 4000);
+            handleError("requery", null, null, Str.Empty, false, e);
         }
     }
 
@@ -387,27 +411,31 @@ public class ServerCommunication
                     .url(BASE_URL + "upgrade.php?user_id=" + id + "&user_key=" + key + "&pro=" + pro + "&pro_token=" + URLEncoder.encode(pro_token, "utf-8"))
                     .build();
 
-            client.newCall(request).enqueue(new Callback() {
+            client.newCall(request).enqueue(new Callback()
+            {
                 @Override
-                public void onFailure(Call call, IOException e) {
-                    Log.e("SC:upgrade", e.toString());
-                    SCNApp.showToast("Communication with server failed", 4000);
+                public void onFailure(Call call, IOException e)
+                {
+                    handleError("upgrade", call, null, Str.Empty, true, e);
                 }
 
                 @Override
-                public void onResponse(Call call, Response response) {
-                    try (ResponseBody responseBody = response.body()) {
-                        if (!response.isSuccessful())
-                            throw new IOException("Unexpected code " + response);
+                public void onResponse(Call call, Response response)
+                {
+                    String r = Str.Empty;
+                    try (ResponseBody responseBody = response.body())
+                    {
+                        if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
                         if (responseBody == null) throw new IOException("No response");
 
-                        String r = responseBody.string();
+                        r = responseBody.string();
                         Log.d("Server::Response", request.url().toString()+"\n"+r);
 
                         JSONObject json = (JSONObject) new JSONTokener(r).nextValue();
 
                         if (!json_bool(json, "success")) {
                             SCNApp.showToast(json_str(json, "message"), 4000);
+                            handleNonSuccess("upgrade", call, response, r);
                             return;
                         }
 
@@ -418,10 +446,15 @@ public class ServerCommunication
                         SCNSettings.inst().save();
 
                         SCNApp.refreshAccountTab();
-                    } catch (Exception e) {
-                        Log.e("SC:upgrade", e.toString());
-                        SCNApp.showToast("Communication with server failed", 4000);
-                    } finally {
+
+                        handleSuccess("upgrade", call, response, r);
+                    }
+                    catch (Exception e)
+                    {
+                        handleError("upgrade", call, response, r, false, e);
+                    }
+                    finally
+                    {
                         SCNApp.runOnUiThread(() -> { if (loader != null) loader.setVisibility(View.GONE); });
                     }
                 }
@@ -429,8 +462,7 @@ public class ServerCommunication
         }
         catch (Exception e)
         {
-            e.printStackTrace();
-            SCNApp.showToast("Communication with server failed", 4000);
+            handleError("upgrade", null, null, Str.Empty, false, e);
         }
     }
 
@@ -442,37 +474,47 @@ public class ServerCommunication
                     .url(BASE_URL + "ack.php?user_id=" + id + "&user_key=" + key + "&scn_msg_id=" + msg_scn_id)
                     .build();
 
-            client.newCall(request).enqueue(new Callback() {
+            client.newCall(request).enqueue(new Callback()
+            {
                 @Override
-                public void onFailure(Call call, IOException e) {
-                    Log.e("SC:ack", e.toString());
+                public void onFailure(Call call, IOException e)
+                {
+                    handleError("ack", call, null, Str.Empty, true, e);
                 }
 
                 @Override
                 public void onResponse(Call call, Response response)
                 {
-                    try (ResponseBody responseBody = response.body()) {
+                    String r = Str.Empty;
+                    try (ResponseBody responseBody = response.body())
+                    {
                         if (!response.isSuccessful())
                             throw new IOException("Unexpected code " + response);
                         if (responseBody == null) throw new IOException("No response");
 
-                        String r = responseBody.string();
+                        r = responseBody.string();
                         Log.d("Server::Response", request.url().toString()+"\n"+r);
 
                         JSONObject json = (JSONObject) new JSONTokener(r).nextValue();
 
-                        if (!json_bool(json, "success")) SCNApp.showToast(json_str(json, "message"), 4000);
+                        if (!json_bool(json, "success"))
+                        {
+                            SCNApp.showToast(json_str(json, "message"), 4000);
+                            handleNonSuccess("ack", call, response, r);
+                        }
 
-                    } catch (Exception e) {
-                        Log.e("SC:ack", e.toString());
-                        SCNApp.showToast("Communication with server failed", 4000);
+                        handleSuccess("ack", call, response, r);
+                    }
+                    catch (Exception e)
+                    {
+                        handleError("ack", call, response, r, false, e);
                     }
                 }
             });
         }
         catch (Exception e)
         {
-            Log.e("SC:ack", e.toString());
+            handleError("ack", null, null, Str.Empty, false, e);
         }
     }
 
@@ -487,21 +529,21 @@ public class ServerCommunication
             client.newCall(request).enqueue(new Callback() {
                 @Override
                 public void onFailure(Call call, IOException e) {
-                    Log.e("SC:expand", e.toString());
-                    SCNApp.showToast("Communication with server failed", 4000);
-                    SCNApp.runOnUiThread(() -> {
-                        if (loader != null) loader.setVisibility(View.GONE);
-                    });
+                    handleError("expand", call, null, Str.Empty, true, e);
+                    SCNApp.runOnUiThread(() -> { if (loader != null) loader.setVisibility(View.GONE); });
                 }
 
                 @Override
-                public void onResponse(Call call, Response response) {
-                    try (ResponseBody responseBody = response.body()) {
+                public void onResponse(Call call, Response response)
+                {
+                    String r = Str.Empty;
+                    try (ResponseBody responseBody = response.body())
+                    {
                         if (!response.isSuccessful())
                             throw new IOException("Unexpected code " + response);
                         if (responseBody == null) throw new IOException("No response");
 
-                        String r = responseBody.string();
+                        r = responseBody.string();
                         Log.d("Server::Response", request.url().toString()+"\n"+r);
 
                         JSONObject json = (JSONObject) new JSONTokener(r).nextValue();
@@ -509,6 +551,7 @@ public class ServerCommunication
                         if (!json_bool(json, "success"))
                         {
                             SCNApp.showToast(json_str(json, "message"), 4000);
+                            handleNonSuccess("expand", call, response, r);
                             return;
                         }
 
@@ -522,21 +565,22 @@ public class ServerCommunication
 
                         okResult.invoke(title, content, prio, time, scn_id);
 
-                    } catch (Exception e) {
-                        Log.e("SC:expand", e.toString());
-                        SCNApp.showToast("Communication with server failed", 4000);
-                    } finally {
-                        SCNApp.runOnUiThread(() -> {
-                            if (loader != null) loader.setVisibility(View.GONE);
-                        });
+                        handleSuccess("expand", call, response, r);
+                    }
+                    catch (Exception e)
+                    {
+                        handleError("expand", call, response, r, false, e);
+                    }
+                    finally
+                    {
+                        SCNApp.runOnUiThread(() -> { if (loader != null) loader.setVisibility(View.GONE); });
                     }
                 }
             });
         }
         catch (Exception e)
         {
-            Log.e("SC:expand", e.toString());
-            SCNApp.showToast("Communication with server failed", 4000);
+            handleError("expand", null, null, Str.Empty, false, e);
         }
     }
 
@@ -564,4 +608,79 @@ public class ServerCommunication
     {
         return o.getString(key);
     }
+
+    private static void handleSuccess(String source, Call call, Response resp, String respBody)
+    {
+        Log.d("SC:"+source, respBody);
+
+        try
+        {
+            Instant i  = Instant.now();
+            String s   = source;
+            String u   = call.request().url().toString();
+            int rc     = resp.code();
+            String r   = respBody;
+            LogLevel l = LogLevel.INFO;
+
+            SingleQuery q = new SingleQuery(l, i, s, u, r, rc, "SUCCESS");
+            QueryLog.inst().add(q);
+        }
+        catch (Exception e2)
+        {
+            Log.e("SC:HandleSuccess", e2.toString());
+        }
+    }
+
+    private static void handleNonSuccess(String source, Call call, Response resp, String respBody)
+    {
+        Log.d("SC:"+source, respBody);
+
+        try
+        {
+            Instant i  = Instant.now();
+            String s   = source;
+            String u   = call.request().url().toString();
+            int rc     = resp.code();
+            String r   = respBody;
+            LogLevel l = LogLevel.WARN;
+
+            SingleQuery q = new SingleQuery(l, i, s, u, r, rc, "NON-SUCCESS");
+            QueryLog.inst().add(q);
+        }
+        catch (Exception e2)
+        {
+            Log.e("SC:HandleSuccess", e2.toString());
+        }
+    }
+
+    private static void handleError(String source, Call call, Response resp, String respBody, boolean isio, Exception e)
+    {
+        Log.e("SC:"+source, e.toString());
+
+        if (isio)
+        {
+            SCNApp.showToast("Can't connect to server", 3000);
+        }
+        else
+        {
+            SCNApp.showToast("Communication with server failed", 4000);
+        }
+
+        try
+        {
+            Instant i  = Instant.now();
+            String s   = source;
+            String u   = (call==null)?Str.Empty:call.request().url().toString();
+            int rc     = (resp==null)?-1:resp.code();
+            String r   = respBody;
+            LogLevel l = isio?LogLevel.WARN:LogLevel.ERROR;
+
+            SingleQuery q = new SingleQuery(l, i, s, u, r, rc, e.toString());
+            QueryLog.inst().add(q);
+        }
+        catch (Exception e2)
+        {
+            Log.e("SC:HandleError", e2.toString());
+        }
+    }
 }

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/SingleQuery.java

@@ -0,0 +1,82 @@
+package com.blackforestbytes.simplecloudnotifier.model;
+
+import android.content.SharedPreferences;
+import android.os.BaseBundle;
+import android.os.Bundle;
+
+import com.blackforestbytes.simplecloudnotifier.lib.string.Str;
+
+import org.joda.time.Instant;
+
+public class SingleQuery
+{
+    public final Instant Timestamp;
+
+    public final LogLevel Level;
+    public final String Name;
+    public final String URL;
+    public final String Response;
+    public final int ResponseCode;
+    public final String ExceptionString;
+
+    public SingleQuery(LogLevel l, Instant i, String n, String u, String r, int rc, String e)
+    {
+        Level=l;
+        Timestamp=i;
+        Name=n;
+        URL=u;
+        Response=r;
+        ResponseCode=rc;
+        ExceptionString=e;
+    }
+
+    public void save(SharedPreferences.Editor e, String base)
+    {
+        e.putInt(base+".Level", Level.asInt());
+        e.putLong(base+".Timestamp", Timestamp.getMillis());
+        e.putString(base+".Name", Name);
+        e.putString(base+".URL", URL);
+        e.putString(base+".Response", Response);
+        e.putInt(base+".ResponseCode", ResponseCode);
+        e.putString(base+".ExceptionString", ExceptionString);
+    }
+
+    public void save(BaseBundle e, String base)
+    {
+        e.putInt(base+".Level", Level.asInt());
+        e.putLong(base+".Timestamp", Timestamp.getMillis());
+        e.putString(base+".Name", Name);
+        e.putString(base+".URL", URL);
+        e.putString(base+".Response", Response);
+        e.putInt(base+".ResponseCode", ResponseCode);
+        e.putString(base+".ExceptionString", ExceptionString);
+    }
+
+    public static SingleQuery load(SharedPreferences e, String base)
+    {
+        return new SingleQuery
+                (
+                        LogLevel.fromInt(e.getInt(base+".Level", 0)),
+                        new Instant(e.getLong(base+".Timestamp", 0)),
+                        e.getString(base+".Name", Str.Empty),
+                        e.getString(base+".URL", Str.Empty),
+                        e.getString(base+".Response", Str.Empty),
+                        e.getInt(base+".ResponseCode", -1),
+                        e.getString(base+".ExceptionString", Str.Empty)
+                );
+    }
+
+    public static SingleQuery load(BaseBundle e, String base)
+    {
+        return new SingleQuery
+                (
+                        LogLevel.fromInt(e.getInt(base+".Level", 0)),
+                        new Instant(e.getLong(base+".Timestamp", 0)),
+                        e.getString(base+".Name", Str.Empty),
+                        e.getString(base+".URL", Str.Empty),
+                        e.getString(base+".Response", Str.Empty),
+                        e.getInt(base+".ResponseCode", -1),
+                        e.getString(base+".ExceptionString", Str.Empty)
+                );
+    }
+}

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/service/FBMService.java

@@ -4,16 +4,21 @@ import android.util.Log;
 import android.widget.Toast;
 
 import com.blackforestbytes.simplecloudnotifier.SCNApp;
-import com.blackforestbytes.simplecloudnotifier.lib.datatypes.Tuple4;
-import com.blackforestbytes.simplecloudnotifier.lib.datatypes.Tuple5;
+import com.blackforestbytes.simplecloudnotifier.lib.string.Str;
 import com.blackforestbytes.simplecloudnotifier.model.CMessage;
 import com.blackforestbytes.simplecloudnotifier.model.CMessageList;
+import com.blackforestbytes.simplecloudnotifier.model.LogLevel;
 import com.blackforestbytes.simplecloudnotifier.model.PriorityEnum;
+import com.blackforestbytes.simplecloudnotifier.model.QueryLog;
 import com.blackforestbytes.simplecloudnotifier.model.SCNSettings;
 import com.blackforestbytes.simplecloudnotifier.model.ServerCommunication;
+import com.blackforestbytes.simplecloudnotifier.model.SingleQuery;
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 
+import org.joda.time.Instant;
+import org.json.JSONObject;
+
 public class FBMService extends FirebaseMessagingService
 {
     @Override
@@ -42,6 +47,10 @@ public class FBMService extends FirebaseMessagingService
             long scn_id       = Long.parseLong(remoteMessage.getData().get("scn_msg_id"));
             boolean trimmed   = Boolean.parseBoolean(remoteMessage.getData().get("trimmed"));
 
+
+            SingleQuery q = new SingleQuery(LogLevel.INFO, Instant.now(), "FBM<recieve>", Str.Empty, new JSONObject(remoteMessage.getData()).toString(), 0, "SUCCESS");
+            QueryLog.inst().add(q);
+
             if (trimmed)
             {
                 ServerCommunication.expand(SCNSettings.inst().user_id, SCNSettings.inst().user_key, scn_id, null, (i1, i2, i3, i4, i5) -> recieveData(i4, i1, i2, i3, i5, false));

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/service/IABService.java

@@ -2,23 +2,37 @@ package com.blackforestbytes.simplecloudnotifier.service;
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.util.Log;
 import android.widget.Toast;
 
 import com.android.billingclient.api.BillingClient;
 import com.android.billingclient.api.BillingClientStateListener;
 import com.android.billingclient.api.BillingFlowParams;
+import com.android.billingclient.api.BillingResult;
 import com.android.billingclient.api.Purchase;
 import com.android.billingclient.api.PurchasesUpdatedListener;
+import com.android.billingclient.api.SkuDetails;
+import com.android.billingclient.api.SkuDetailsParams;
+import com.android.billingclient.api.SkuDetailsResponseListener;
 import com.blackforestbytes.simplecloudnotifier.SCNApp;
+import com.blackforestbytes.simplecloudnotifier.lib.datatypes.Tuple2;
+import com.blackforestbytes.simplecloudnotifier.lib.datatypes.Tuple3;
 import com.blackforestbytes.simplecloudnotifier.lib.lambda.Func0to0;
 import com.blackforestbytes.simplecloudnotifier.lib.string.Str;
 import com.blackforestbytes.simplecloudnotifier.model.SCNSettings;
 import com.blackforestbytes.simplecloudnotifier.view.MainActivity;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Dictionary;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import static androidx.constraintlayout.widget.Constraints.TAG;
@@ -45,18 +59,72 @@ public class IABService implements PurchasesUpdatedListener
         }
     }
 
+    public enum SimplePurchaseState { YES, NO, UNINITIALIZED }
+
     private BillingClient client;
     private boolean isServiceConnected;
     private final List<Purchase> purchases = new ArrayList<>();
+    private boolean _isInitialized = false;
+
+    private final Map<String, Boolean> _localCache= new HashMap<>();
 
     public IABService(Context c)
     {
+        _isInitialized = false;
+
+        loadCache();
+
         client = BillingClient
                 .newBuilder(c)
                 .setListener(this)
                 .build();
 
         startServiceConnection(this::queryPurchases, false);
+        startServiceConnection(this::querySkuDetails, false);
+    }
+
+    public void reloadPrefs()
+    {
+        loadCache();
+    }
+
+    private void loadCache()
+    {
+        _localCache.clear();
+        SharedPreferences sharedPref = SCNApp.getContext().getSharedPreferences("IAB", Context.MODE_PRIVATE);
+        int count = sharedPref.getInt("c", 0);
+        for (int i=0; i < count; i++)
+        {
+            String  k = sharedPref.getString("["+i+"]->key", null);
+            boolean v = sharedPref.getBoolean("["+i+"]->value", false);
+            if (k==null)continue;
+            _localCache.put(k, v);
+        }
+    }
+
+    private void saveCache()
+    {
+        SharedPreferences sharedPref = SCNApp.getContext().getSharedPreferences("IAB", Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor= sharedPref.edit();
+
+        editor.putInt("c", _localCache.size());
+        int i = 0;
+        for (Map.Entry<String, Boolean> e : _localCache.entrySet())
+        {
+            editor.putString("["+i+"]->key", e.getKey());
+            editor.putBoolean("["+i+"]->value", e.getValue());
+            i++;
+        }
+        editor.apply();
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    private synchronized void updateCache(String k, boolean v)
+    {
+        if (_localCache.containsKey(k) && _localCache.get(k)==v) return;
+
+        _localCache.put(k, v);
+        saveCache();
     }
 
     public void queryPurchases()
@@ -67,14 +135,16 @@ public class IABService implements PurchasesUpdatedListener
             Purchase.PurchasesResult purchasesResult = client.queryPurchases(BillingClient.SkuType.INAPP);
             Log.i(TAG, "Querying purchases elapsed time: " + (System.currentTimeMillis() - time) + "ms");
 
-            if (purchasesResult.getResponseCode() == BillingClient.BillingResponse.OK)
+            if (purchasesResult.getResponseCode() == BillingClient.BillingResponseCode.OK)
             {
-                for (Purchase p : purchasesResult.getPurchasesList())
+                for (Purchase p : Objects.requireNonNull(purchasesResult.getPurchasesList()))
                 {
-                    handlePurchase(p);
+                    handlePurchase(p, false);
                 }
 
-                boolean newProMode = getPurchaseCached(IAB_PRO_MODE) != null;
+                _isInitialized = true;
+
+                boolean newProMode = getPurchaseCachedSimple(IAB_PRO_MODE);
                 if (newProMode != SCNSettings.inst().promode_local)
                 {
                     refreshProModeListener();
@@ -89,20 +159,39 @@ public class IABService implements PurchasesUpdatedListener
         executeServiceRequest(queryToExecute, false);
     }
 
-    public void purchase(Activity a, String id)
-    {
-        executeServiceRequest(() ->
-        {
-            BillingFlowParams flowParams = BillingFlowParams
-                    .newBuilder()
-                    .setSku(id)
-                    .setType(BillingClient.SkuType.INAPP) // SkuType.SUB for subscription
-                    .build();
-            client.launchBillingFlow(a, flowParams);
-        }, true);
+    public void querySkuDetails() {
     }
 
-    private void executeServiceRequest(Func0to0 runnable, final boolean userRequest) {
+    public void purchase(Activity a, String id)
+    {
+        Func0to0 queryRequest = () -> {
+            // Query the purchase async
+            SkuDetailsParams.Builder params = SkuDetailsParams.newBuilder();
+            params.setSkusList(Collections.singletonList(id)).setType(BillingClient.SkuType.INAPP);
+            client.querySkuDetailsAsync(params.build(), (billingResult, skuDetailsList) ->
+            {
+                if (billingResult.getResponseCode() != BillingClient.BillingResponseCode.OK || skuDetailsList == null || skuDetailsList.size() != 1)
+                {
+                    SCNApp.showToast("Could not find product", Toast.LENGTH_SHORT);
+                    return;
+                }
+
+                executeServiceRequest(() ->
+                {
+                    BillingFlowParams flowParams = BillingFlowParams
+                            .newBuilder()
+                            .setSkuDetails(skuDetailsList.get(0))
+                            .build();
+                    client.launchBillingFlow(a, flowParams);
+                }, true);
+            });
+        };
+        executeServiceRequest(queryRequest, false);
+
+    }
+
+    private void executeServiceRequest(Func0to0 runnable, final boolean userRequest)
+    {
         if (isServiceConnected)
         {
             runnable.invoke();
@@ -124,34 +213,37 @@ public class IABService implements PurchasesUpdatedListener
     }
 
     @Override
-    public void onPurchasesUpdated(int responseCode, @Nullable List<Purchase> purchases)
+    public void onPurchasesUpdated(@NonNull BillingResult billingResult, @Nullable List<Purchase> purchases)
     {
-        if (responseCode == BillingClient.BillingResponse.OK && purchases != null)
+        if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK && purchases != null)
         {
             for (Purchase purchase : purchases)
             {
-                handlePurchase(purchase);
+                handlePurchase(purchase, true);
             }
         }
-        else if (responseCode == BillingClient.BillingResponse.ITEM_ALREADY_OWNED && purchases != null)
+        else if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.ITEM_ALREADY_OWNED && purchases != null)
         {
             for (Purchase purchase : purchases)
             {
-                handlePurchase(purchase);
+                handlePurchase(purchase, true);
             }
         }
     }
 
-    private void handlePurchase(Purchase purchase)
+    private void handlePurchase(Purchase purchase, boolean triggerUpdate)
     {
         Log.d(TAG, "Got a verified purchase: " + purchase);
 
         purchases.add(purchase);
 
-        refreshProModeListener();
+        if (triggerUpdate) refreshProModeListener();
+
+        updateCache(purchase.getSku(), true);
     }
 
-    private void refreshProModeListener() {
+    private void refreshProModeListener()
+    {
         MainActivity ma = SCNApp.getMainActivity();
         if (ma != null) ma.adpTabs.tab3.updateProState();
         if (ma != null) ma.adpTabs.tab1.updateProState();
@@ -163,9 +255,9 @@ public class IABService implements PurchasesUpdatedListener
         client.startConnection(new BillingClientStateListener()
         {
             @Override
-            public void onBillingSetupFinished(@BillingClient.BillingResponse int billingResponseCode)
+            public void onBillingSetupFinished(@NonNull BillingResult billingResult)
             {
-                if (billingResponseCode == BillingClient.BillingResponse.OK)
+                if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK)
                 {
                     isServiceConnected = true;
                     if (executeOnSuccess != null) executeOnSuccess.invoke();
@@ -183,13 +275,31 @@ public class IABService implements PurchasesUpdatedListener
         });
     }
 
-    public Purchase getPurchaseCached(String id)
+    public boolean getPurchaseCachedSimple(String id)
     {
-        for (Purchase p : purchases)
+        return getPurchaseCachedExtended(id).Item1;
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    public Tuple3<Boolean, Boolean, String> getPurchaseCachedExtended(String id)
+    {
+        // <state, initialized, token>
+
+        if (!_isInitialized)
         {
-            if (Str.equals(p.getSku(), id)) return p;
+            if (_localCache.containsKey(id) && _localCache.get(id)) return new Tuple3<>(true, false, Str.Empty);
         }
 
-        return null;
+        for (Purchase p : purchases)
+        {
+            if (Str.equals(p.getSku(), id))
+            {
+                updateCache(id, true);
+                return new Tuple3<>(true, true, p.getPurchaseToken());
+            }
+        }
+
+        updateCache(id, false);
+        return new Tuple3<>(false, true, Str.Empty);
     }
 }

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/service/NotificationService.java

@@ -229,10 +229,10 @@ public class NotificationService
         if (msg.Priority == PriorityEnum.NORMAL) mBuilder.setPriority(NotificationCompat.PRIORITY_DEFAULT);
         if (msg.Priority == PriorityEnum.HIGH)   mBuilder.setPriority(NotificationCompat.PRIORITY_HIGH);
 
-        Intent intnt_click = new Intent(SCNApp.getContext(), BroadcastReceiverService.class);
-        intnt_click.putExtra(BroadcastReceiverService.ID_KEY, BroadcastReceiverService.NOTIF_SHOW_MAIN);
-        PendingIntent pi = PendingIntent.getBroadcast(ctxt, 0, intnt_click, 0);
+        Intent intent = new Intent(ctxt, MainActivity.class);
+        PendingIntent pi = PendingIntent.getActivity(ctxt, 0, intent, 0);
         mBuilder.setContentIntent(pi);
+
         NotificationManager mNotificationManager = (NotificationManager) ctxt.getSystemService(Context.NOTIFICATION_SERVICE);
         if (mNotificationManager == null) return;
 

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/util/MaxHeightScrollView.java

@@ -0,0 +1,56 @@
+package com.blackforestbytes.simplecloudnotifier.util;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.widget.ScrollView;
+
+import com.blackforestbytes.simplecloudnotifier.R;
+
+public class MaxHeightScrollView extends ScrollView
+{
+	public int maxHeight = Integer.MAX_VALUE;//dp
+
+	public MaxHeightScrollView(Context context)
+	{
+		super(context);
+	}
+
+	public MaxHeightScrollView(Context context, AttributeSet attrs)
+	{
+		super(context, attrs);
+
+		TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.MaxHeightScrollView, 0, 0);
+		try {
+			maxHeight = a.getInteger(R.styleable.MaxHeightScrollView_maxHeightOverride, Integer.MAX_VALUE);
+		} finally {
+			a.recycle();
+		}
+	}
+
+	public MaxHeightScrollView(Context context, AttributeSet attrs, int defStyleAttr)
+	{
+		super(context, attrs, defStyleAttr);
+
+		TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.MaxHeightScrollView, 0, 0);
+		try {
+			maxHeight = a.getInteger(R.styleable.MaxHeightScrollView_maxHeightOverride, Integer.MAX_VALUE);
+		} finally {
+			a.recycle();
+		}
+	}
+
+	@Override
+	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
+	{
+		heightMeasureSpec = MeasureSpec.makeMeasureSpec(dpToPx(getResources(), maxHeight), MeasureSpec.AT_MOST);
+		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+	}
+
+	private int dpToPx(Resources res, int dp)
+	{
+		return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, res.getDisplayMetrics());
+	}
+}

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/util/TextChangedListener.java

@@ -0,0 +1,25 @@
+package com.blackforestbytes.simplecloudnotifier.util;
+
+import android.text.Editable;
+import android.text.TextWatcher;
+
+public abstract class TextChangedListener<T> implements TextWatcher {
+    private T target;
+
+    public TextChangedListener(T target) {
+        this.target = target;
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) {}
+
+    @Override
+    public void afterTextChanged(Editable s) {
+        this.onTextChanged(target, s);
+    }
+
+    public abstract void onTextChanged(T target, Editable s);
+}

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/MainActivity.java

@@ -1,14 +1,23 @@
 package com.blackforestbytes.simplecloudnotifier.view;
 
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
 import android.widget.RelativeLayout;
+import android.widget.Toast;
 
 import com.blackforestbytes.simplecloudnotifier.R;
 import com.blackforestbytes.simplecloudnotifier.SCNApp;
 import com.blackforestbytes.simplecloudnotifier.model.CMessageList;
+import com.blackforestbytes.simplecloudnotifier.model.QueryLog;
 import com.blackforestbytes.simplecloudnotifier.model.SCNSettings;
 import com.blackforestbytes.simplecloudnotifier.service.IABService;
 import com.blackforestbytes.simplecloudnotifier.service.NotificationService;
+import com.blackforestbytes.simplecloudnotifier.view.debug.QueryLogActivity;
 import com.google.android.material.tabs.TabLayout;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -16,6 +25,12 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.ObjectInputStream;
+import java.util.Map;
+import java.util.Set;
+
 public class MainActivity extends AppCompatActivity
 {
     public TabAdapter adpTabs;
@@ -24,6 +39,8 @@ public class MainActivity extends AppCompatActivity
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
+        QueryLog.inst();
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
@@ -33,6 +50,7 @@ public class MainActivity extends AppCompatActivity
         layoutRoot = findViewById(R.id.layoutRoot);
 
         Toolbar toolbar = findViewById(R.id.toolbar);
+        toolbar.setOnClickListener(this::onToolbackClicked);
         setSupportActionBar(toolbar);
 
         ViewPager viewPager = findViewById(R.id.pager);
@@ -61,7 +79,7 @@ public class MainActivity extends AppCompatActivity
 
         SCNApp.register(this);
         IABService.startup(this);
-        SCNSettings.inst().work(this);
+        SCNSettings.inst().work(this, true);
     }
 
     @Override
@@ -81,4 +99,126 @@ public class MainActivity extends AppCompatActivity
         CMessageList.inst().fullSave();
         IABService.inst().destroy();
     }
+
+    private int clickCount = 0;
+    private long lastClick = 0;
+    private void onToolbackClicked(View v)
+    {
+        long now = System.currentTimeMillis();
+        if (now - lastClick > 200) clickCount=0;
+        clickCount++;
+        lastClick = now;
+
+        if (clickCount == 4) startActivity(new Intent(this, QueryLogActivity.class));
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if(requestCode == 1991 && resultCode == RESULT_OK)
+        {
+            Uri uri = data.getData(); //The uri with the location of the file
+
+            Context ctxt = this;
+
+            try
+            {
+                ObjectInputStream stream = new ObjectInputStream(getContentResolver().openInputStream(uri));
+
+                Map<String, ?> d1 = (Map<String, ?>)stream.readObject();
+                Map<String, ?> d2 = (Map<String, ?>)stream.readObject();
+                Map<String, ?> d3 = (Map<String, ?>)stream.readObject();
+                Map<String, ?> d4 = (Map<String, ?>)stream.readObject();
+
+                stream.close();
+
+                runOnUiThread(() ->
+                {
+
+                    SharedPreferences.Editor e1 = ctxt.getSharedPreferences("Config", Context.MODE_PRIVATE).edit();
+                    SharedPreferences.Editor e2 = ctxt.getSharedPreferences("IAB", Context.MODE_PRIVATE).edit();
+                    SharedPreferences.Editor e3 = ctxt.getSharedPreferences("CMessageList", Context.MODE_PRIVATE).edit();
+                    SharedPreferences.Editor e4 = ctxt.getSharedPreferences("QueryLog", Context.MODE_PRIVATE).edit();
+
+                    e1.clear();
+                    for (Map.Entry<String, ?> entry : d1.entrySet())
+                    {
+                        if (entry.getValue() instanceof String)  e1.putString(entry.getKey(),    (String)entry.getValue());
+                        if (entry.getValue() instanceof Boolean) e1.putBoolean(entry.getKey(),   (Boolean)entry.getValue());
+                        if (entry.getValue() instanceof Float)   e1.putFloat(entry.getKey(),     (Float)entry.getValue());
+                        if (entry.getValue() instanceof Integer) e1.putInt(entry.getKey(),       (Integer)entry.getValue());
+                        if (entry.getValue() instanceof Long)    e1.putLong(entry.getKey(),      (Long)entry.getValue());
+                        if (entry.getValue() instanceof Set<?>)  e1.putStringSet(entry.getKey(), (Set<String>)entry.getValue());
+                    }
+
+                    e2.clear();
+                    for (Map.Entry<String, ?> entry : d2.entrySet())
+                    {
+                        if (entry.getValue() instanceof String)  e2.putString(entry.getKey(),    (String)entry.getValue());
+                        if (entry.getValue() instanceof Boolean) e2.putBoolean(entry.getKey(),   (Boolean)entry.getValue());
+                        if (entry.getValue() instanceof Float)   e2.putFloat(entry.getKey(),     (Float)entry.getValue());
+                        if (entry.getValue() instanceof Integer) e2.putInt(entry.getKey(),       (Integer)entry.getValue());
+                        if (entry.getValue() instanceof Long)    e2.putLong(entry.getKey(),      (Long)entry.getValue());
+                        if (entry.getValue() instanceof Set<?>)  e2.putStringSet(entry.getKey(), (Set<String>)entry.getValue());
+                    }
+
+                    e2.clear();
+                    for (Map.Entry<String, ?> entry : d3.entrySet())
+                    {
+                        if (entry.getValue() instanceof String)  e3.putString(entry.getKey(),    (String)entry.getValue());
+                        if (entry.getValue() instanceof Boolean) e3.putBoolean(entry.getKey(),   (Boolean)entry.getValue());
+                        if (entry.getValue() instanceof Float)   e3.putFloat(entry.getKey(),     (Float)entry.getValue());
+                        if (entry.getValue() instanceof Integer) e3.putInt(entry.getKey(),       (Integer)entry.getValue());
+                        if (entry.getValue() instanceof Long)    e3.putLong(entry.getKey(),      (Long)entry.getValue());
+                        if (entry.getValue() instanceof Set<?>)  e3.putStringSet(entry.getKey(), (Set<String>)entry.getValue());
+                    }
+
+                    e4.clear();
+                    for (Map.Entry<String, ?> entry : d4.entrySet())
+                    {
+                        if (entry.getValue() instanceof String)  e4.putString(entry.getKey(),    (String)entry.getValue());
+                        if (entry.getValue() instanceof Boolean) e4.putBoolean(entry.getKey(),   (Boolean)entry.getValue());
+                        if (entry.getValue() instanceof Float)   e4.putFloat(entry.getKey(),     (Float)entry.getValue());
+                        if (entry.getValue() instanceof Integer) e4.putInt(entry.getKey(),       (Integer)entry.getValue());
+                        if (entry.getValue() instanceof Long)    e4.putLong(entry.getKey(),      (Long)entry.getValue());
+                        if (entry.getValue() instanceof Set<?>)  e4.putStringSet(entry.getKey(), (Set<String>)entry.getValue());
+                    }
+
+                    e1.apply();
+                    e2.apply();
+                    e3.apply();
+                    e4.apply();
+
+
+                    SCNSettings.inst().reloadPrefs();
+                    IABService.inst().reloadPrefs();
+                    CMessageList.inst().reloadPrefs();
+                    QueryLog.inst().reloadPrefs();
+
+
+                    Toolbar toolbar = findViewById(R.id.toolbar);
+                    setSupportActionBar(toolbar);
+
+                    ViewPager viewPager = findViewById(R.id.pager);
+                    PagerAdapter adapter = adpTabs = new TabAdapter(getSupportFragmentManager());
+                    viewPager.setAdapter(adapter);
+
+                    TabLayout tabLayout = findViewById(R.id.tab_layout);
+                    tabLayout.setupWithViewPager(viewPager);
+
+
+                    SCNSettings.inst().work(this, true);
+
+                    SCNApp.showToast("Backup imported", Toast.LENGTH_LONG);
+
+                    finish();
+                });
+            }
+            catch (Exception e)
+            {
+                Log.e("Import:Err", e.toString());
+                SCNApp.showToast("Import failed", Toast.LENGTH_LONG);
+            }
+        }
+    }
 }

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/MessageAdapter.java

@@ -1,5 +1,6 @@
 package com.blackforestbytes.simplecloudnotifier.view;
 
+import android.content.Intent;
 import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -9,8 +10,11 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.blackforestbytes.simplecloudnotifier.R;
+import com.blackforestbytes.simplecloudnotifier.SCNApp;
 import com.blackforestbytes.simplecloudnotifier.model.CMessage;
 import com.blackforestbytes.simplecloudnotifier.model.CMessageList;
+import com.blackforestbytes.simplecloudnotifier.model.SCNSettings;
+import com.google.android.material.button.MaterialButton;
 
 import java.lang.ref.WeakReference;
 import java.util.Collections;
@@ -53,7 +57,7 @@ public class MessageAdapter extends RecyclerView.Adapter
     {
         CMessage msg = CMessageList.inst().tryGetFromBack(position);
         MessagePresenter view = (MessagePresenter) holder;
-        view.setMessage(msg);
+        view.setMessage(msg, position);
 
         viewHolders.put(view, true);
     }
@@ -110,7 +114,11 @@ public class MessageAdapter extends RecyclerView.Adapter
         public RelativeLayout viewForeground;
         public RelativeLayout viewBackground;
 
+        public MaterialButton btnShare;
+        public MaterialButton btnDelete;
+
         private CMessage data;
+        private int datapos;
 
         MessagePresenter(View itemView)
         {
@@ -121,6 +129,8 @@ public class MessageAdapter extends RecyclerView.Adapter
             ivPriority     = itemView.findViewById(R.id.ivPriority);
             viewForeground = itemView.findViewById(R.id.layoutFront);
             viewBackground = itemView.findViewById(R.id.layoutBack);
+            btnShare       = itemView.findViewById(R.id.btnShare);
+            btnDelete      = itemView.findViewById(R.id.btnDelete);
 
             itemView.setOnClickListener(this);
             tvTimestamp.setOnClickListener(this);
@@ -128,9 +138,22 @@ public class MessageAdapter extends RecyclerView.Adapter
             tvMessage.setOnClickListener(this);
             ivPriority.setOnClickListener(this);
             viewForeground.setOnClickListener(this);
+
+            btnShare.setOnClickListener(v ->
+            {
+                if (data == null) return;
+                Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
+                sharingIntent.setType("text/plain");
+                sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, data.Title);
+                sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, data.Content);
+                SCNApp.getMainActivity().startActivity(Intent.createChooser(sharingIntent, "Share message"));
+
+            });
+            btnDelete.setOnClickListener(v -> { if (data != null) SCNApp.getMainActivity().adpTabs.tab1.deleteMessage(datapos); });
+
         }
 
-        void setMessage(CMessage msg)
+        void setMessage(CMessage msg, int pos)
         {
             tvTimestamp.setText(msg.formatTimestamp());
             tvTitle.setText(msg.Title);
@@ -155,21 +178,49 @@ public class MessageAdapter extends RecyclerView.Adapter
             }
 
             data = msg;
+            datapos = pos;
+
+            if (msg.IsExpandedInAdapter) expand(true); else collapse(true);
+        }
+
+        private void expand(boolean force)
+        {
+            if (data != null && data.IsExpandedInAdapter && !force) return;
+            if (data != null) data.IsExpandedInAdapter = true;
+            if (tvMessage != null) tvMessage.setMaxLines(9999);
+            if (btnDelete != null) btnDelete.setVisibility(View.VISIBLE);
+            if (btnShare != null) btnShare.setVisibility(View.VISIBLE);
+
+        }
+
+        private int norm(int i) { return (i<=0)?0:((i>9999)?9999:i); }
+
+        private void collapse(boolean force)
+        {
+            if (data != null && !data.IsExpandedInAdapter && !force) return;
+            if (data != null) data.IsExpandedInAdapter = false;
+            if (tvMessage != null) tvMessage.setMaxLines(norm(SCNSettings.inst().PreviewLineCount));
+            if (btnDelete != null) btnDelete.setVisibility(View.GONE);
+            if (btnShare != null) btnShare.setVisibility(View.GONE);
         }
 
         @Override
         public void onClick(View v)
         {
+            if (data.IsExpandedInAdapter)
+            {
+                collapse(false);
+                return;
+            }
+
             for (MessagePresenter holder : MessageAdapter.this.viewHolders.keySet())
             {
                 if (holder == null) continue;
                 if (holder == this) continue;
-                if (holder.tvMessage == null) continue;
-                if (holder.tvMessage.getMaxLines() == 6) continue;
-                holder.tvMessage.setMaxLines(6);
+                holder.collapse(false);
             }
 
-            tvMessage.setMaxLines(9999);
+            expand(false);
         }
     }
 }

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/NotificationsFragment.java

@@ -58,7 +58,7 @@ public class NotificationsFragment extends Fragment implements MessageAdapterTou
 
     public void updateProState()
     {
-        if (adView != null) adView.setVisibility(IABService.inst().getPurchaseCached(IABService.IAB_PRO_MODE) != null ? View.GONE : View.VISIBLE);
+        if (adView != null) adView.setVisibility(IABService.inst().getPurchaseCachedSimple(IABService.IAB_PRO_MODE) ? View.GONE : View.VISIBLE);
     }
 
     @Override
@@ -66,18 +66,23 @@ public class NotificationsFragment extends Fragment implements MessageAdapterTou
     {
         if (viewHolder instanceof MessageAdapter.MessagePresenter)
         {
-            final int deletedIndex = viewHolder.getAdapterPosition();
-
-            final CMessage deletedItem = adpMessages.removeItem(viewHolder.getAdapterPosition());
-            String name = deletedItem.Title;
-
-            Snackbar snackbar = Snackbar.make(SCNApp.getMainActivity().layoutRoot, name + " removed", Snackbar.LENGTH_LONG);
-            snackbar.setAction("UNDO", view -> adpMessages.restoreItem(deletedItem, deletedIndex));
-            snackbar.setActionTextColor(Color.YELLOW);
-            snackbar.show();
+            deleteMessage(viewHolder.getAdapterPosition());
         }
     }
 
+    public void deleteMessage(int pos)
+    {
+        final int deletedIndex = pos;
+
+        final CMessage deletedItem = adpMessages.removeItem(pos);
+        String name = deletedItem.Title;
+
+        Snackbar snackbar = Snackbar.make(SCNApp.getMainActivity().layoutRoot, name + " removed", Snackbar.LENGTH_LONG);
+        snackbar.setAction("UNDO", view -> adpMessages.restoreItem(deletedItem, deletedIndex));
+        snackbar.setActionTextColor(Color.YELLOW);
+        snackbar.show();
+    }
+
     public void updateDeleteSwipeEnabled()
     {
         if (touchHelper != null) touchHelper.updateEnabled();

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/SettingsFragment.java

@@ -1,15 +1,15 @@
 package com.blackforestbytes.simplecloudnotifier.view;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Color;
 import android.media.AudioAttributes;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
-import android.media.Ringtone;
-import android.media.RingtoneManager;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
+import android.text.Editable;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -17,6 +17,7 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.SeekBar;
 import android.widget.Spinner;
@@ -24,21 +25,26 @@ import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.android.billingclient.api.Purchase;
+import androidx.annotation.NonNull;
+import androidx.core.content.FileProvider;
+import androidx.fragment.app.Fragment;
+
 import com.blackforestbytes.simplecloudnotifier.R;
 import com.blackforestbytes.simplecloudnotifier.SCNApp;
-import com.blackforestbytes.simplecloudnotifier.lib.android.ThreadUtils;
 import com.blackforestbytes.simplecloudnotifier.lib.lambda.FI;
 import com.blackforestbytes.simplecloudnotifier.lib.string.Str;
 import com.blackforestbytes.simplecloudnotifier.model.SCNSettings;
 import com.blackforestbytes.simplecloudnotifier.service.IABService;
+import com.blackforestbytes.simplecloudnotifier.util.TextChangedListener;
 
 import org.jetbrains.annotations.NotNull;
 
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.util.Map;
 
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
 import top.defaults.colorpicker.ColorPickerPopup;
 import xyz.aprildown.ultimatemusicpicker.MusicPickerListener;
 import xyz.aprildown.ultimatemusicpicker.UltimateMusicPicker;
@@ -51,6 +57,7 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
     private TextView  prefUpgradeAccount_msg;
     private TextView  prefUpgradeAccount_info;
     private Switch    prefEnableDeleteSwipe;
+    private EditText  prefPreviewLineCount;
 
     private Switch    prefMsgLowEnableSound;
     private TextView  prefMsgLowRingtone_value;
@@ -88,6 +95,9 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
     private SeekBar   prefMsgHighVolume;
     private ImageView prefMsgHighVolumeTest;
 
+    private Button    prefBtnImport;
+    private Button    prefBtnExport;
+
     private int musicPickerSwitch = -1;
 
     private MediaPlayer[] mPlayers = new MediaPlayer[3];
@@ -117,6 +127,7 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
         prefUpgradeAccount_msg        = v.findViewById(R.id.prefUpgradeAccount2);
         prefUpgradeAccount_info       = v.findViewById(R.id.prefUpgradeAccount_info);
         prefEnableDeleteSwipe         = v.findViewById(R.id.prefEnableDeleteSwipe);
+        prefPreviewLineCount          = v.findViewById(R.id.prefPreviewLineCount);
 
         prefMsgLowEnableSound         = v.findViewById(R.id.prefMsgLowEnableSound);
         prefMsgLowRingtone_value      = v.findViewById(R.id.prefMsgLowRingtone_value);
@@ -154,11 +165,15 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
         prefMsgHighVolume             = v.findViewById(R.id.prefMsgHighVolume);
         prefMsgHighVolumeTest         = v.findViewById(R.id.btnHighVolumeTest);
 
+        prefBtnExport                 = v.findViewById(R.id.prefExport);
+        prefBtnImport                 = v.findViewById(R.id.prefImport);
+
         ArrayAdapter<Integer> plcsa = new ArrayAdapter<>(v.getContext(), android.R.layout.simple_spinner_item, SCNSettings.CHOOSABLE_CACHE_SIZES);
         plcsa.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         prefLocalCacheSize.setAdapter(plcsa);
     }
 
+    @SuppressLint("SetTextI18n")
     private void updateUI()
     {
         SCNSettings s = SCNSettings.inst();
@@ -167,6 +182,7 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
 
         if (prefAppEnabled.isChecked() != s.Enabled) prefAppEnabled.setChecked(s.Enabled);
         if (prefEnableDeleteSwipe.isChecked() != s.EnableDeleteSwipe) prefEnableDeleteSwipe.setChecked(s.EnableDeleteSwipe);
+        if (!prefPreviewLineCount.getText().toString().equals(Integer.toString(s.PreviewLineCount))) prefPreviewLineCount.setText(Integer.toString(s.PreviewLineCount));
 
         prefUpgradeAccount.setVisibility(     SCNSettings.inst().promode_local ? View.GONE    : View.VISIBLE);
         prefUpgradeAccount_info.setVisibility(SCNSettings.inst().promode_local ? View.GONE    : View.VISIBLE);
@@ -220,6 +236,12 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
 
         prefAppEnabled.setOnCheckedChangeListener((a,b) -> { boolean prev=s.Enabled; s.Enabled=b; saveAndUpdate(); updateEnabled(prev, b); });
         prefEnableDeleteSwipe.setOnCheckedChangeListener((a,b) -> { s.EnableDeleteSwipe=b; saveAndUpdate(); });
+        prefPreviewLineCount.addTextChangedListener(new TextChangedListener<EditText>(prefPreviewLineCount) {
+            @Override
+            public void onTextChanged(EditText target, Editable ed) {
+                if (!ed.toString().isEmpty()) try { s.PreviewLineCount=Integer.parseInt(ed.toString()); saveAndUpdate(); } catch (Exception e) { /* */ }
+            }
+        });
 
         prefLocalCacheSize.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener()
         {
@@ -232,6 +254,9 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
 
         prefUpgradeAccount.setOnClickListener(a -> onUpgradeAccount());
 
+        prefBtnExport.setOnClickListener(a -> onExport());
+        prefBtnImport.setOnClickListener(a -> onImport());
+
         prefMsgLowEnableSound.setOnCheckedChangeListener((a,b) -> { s.PriorityLow.EnableSound=b; saveAndUpdate(); });
         prefMsgLowRingtone_container.setOnClickListener(a -> chooseRingtoneLow());
         prefMsgLowRepeatSound.setOnCheckedChangeListener((a,b) -> { s.PriorityLow.RepeatSound=b; saveAndUpdate(); });
@@ -263,6 +288,55 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
         prefMsgHighVolumeTest.setOnClickListener((v) -> { if (s.PriorityHigh.ForceVolume) playTestSound(2, prefMsgHighVolumeTest, s.PriorityHigh.SoundSource, s.PriorityHigh.ForceVolumeValue); });
     }
 
+    private void onExport()
+    {
+        Context ctxt = getContext();
+        if (ctxt == null) return;
+
+        try
+        {
+            File outputDir = ctxt.getCacheDir(); // context being the Activity pointer
+            File outputFile = File.createTempFile("scn_export_", ".dat", outputDir);
+
+            ObjectOutputStream output = new ObjectOutputStream(new FileOutputStream(outputFile));
+
+            Map<String, ?> d1 = ctxt.getSharedPreferences("Config", Context.MODE_PRIVATE).getAll();
+            Map<String, ?> d2 = ctxt.getSharedPreferences("IAB", Context.MODE_PRIVATE).getAll();
+            Map<String, ?> d3 = ctxt.getSharedPreferences("CMessageList", Context.MODE_PRIVATE).getAll();
+            Map<String, ?> d4 = ctxt.getSharedPreferences("QueryLog", Context.MODE_PRIVATE).getAll();
+
+            output.writeObject(d1);
+            output.writeObject(d2);
+            output.writeObject(d3);
+            output.writeObject(d4);
+
+            Intent intent = new Intent(Intent.ACTION_SEND);
+
+            Uri uri = FileProvider.getUriForFile(ctxt, "com.blackforestbytes.simplecloudnotifier.fileprovider", outputFile);
+            intent.putExtra(Intent.EXTRA_STREAM, uri);
+            intent.setType("*/*");
+            intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+            startActivity(Intent.createChooser(intent, "Export"));
+        }
+        catch (IOException e)
+        {
+            Log.e("Export:Err", e.toString());
+            SCNApp.showToast("Export failed", Toast.LENGTH_LONG);
+        }
+    }
+
+    private void onImport()
+    {
+        SCNApp.getMainActivity().setContentView(R.layout.activity_main);
+
+        Intent intent = new Intent()
+                .setType("*/*")
+                .setAction(Intent.ACTION_GET_CONTENT);
+
+        ((MainActivity)getActivity()).startActivityForResult(Intent.createChooser(intent, "Select a file"), 1991);
+    }
+
     private void updateEnabled(boolean prev, boolean now)
     {
         if (!prev && now)
@@ -352,11 +426,11 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
 
     public void updateProState()
     {
-        Purchase p = IABService.inst().getPurchaseCached(IABService.IAB_PRO_MODE);
+        boolean pmode = IABService.inst().getPurchaseCachedSimple(IABService.IAB_PRO_MODE);
 
-        if (prefUpgradeAccount != null)      prefUpgradeAccount.setVisibility(     p != null ? View.GONE    : View.VISIBLE);
-        if (prefUpgradeAccount_info != null) prefUpgradeAccount_info.setVisibility(p != null ? View.GONE    : View.VISIBLE);
-        if (prefUpgradeAccount_msg != null)  prefUpgradeAccount_msg.setVisibility( p != null ? View.VISIBLE : View.GONE   );
+        if (prefUpgradeAccount != null)      prefUpgradeAccount.setVisibility(     pmode ? View.GONE    : View.VISIBLE);
+        if (prefUpgradeAccount_info != null) prefUpgradeAccount_info.setVisibility(pmode ? View.GONE    : View.VISIBLE);
+        if (prefUpgradeAccount_msg != null)  prefUpgradeAccount_msg.setVisibility( pmode ? View.VISIBLE : View.GONE   );
     }
 
     private int getCacheSizeIndex(int value)

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/debug/QueryLogActivity.java

@@ -0,0 +1,44 @@
+package com.blackforestbytes.simplecloudnotifier.view.debug;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.blackforestbytes.simplecloudnotifier.model.QueryLog;
+import com.blackforestbytes.simplecloudnotifier.model.SingleQuery;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.widget.ListView;
+
+import com.blackforestbytes.simplecloudnotifier.R;
+
+public class QueryLogActivity extends AppCompatActivity
+{
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_querylog);
+
+        ListView lvMain = findViewById(R.id.lvQueryList);
+        SingleQuery[] arr = QueryLog.inst().get().toArray(new SingleQuery[0]);
+        QueryLogAdapter a = new QueryLogAdapter(this, arr);
+        lvMain.setAdapter(a);
+
+        lvMain.setOnItemClickListener((parent, view, position, id) ->
+        {
+            if (position >= 0 && position < arr.length)
+            {
+                Intent i = new Intent(QueryLogActivity.this, SingleQueryLogActivity.class);
+                Bundle b = new Bundle();
+                arr[position].save(b, "data");
+                i.putExtra("query", b);
+                startActivity(i);
+            }
+        });
+
+
+    }
+
+}

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/debug/QueryLogAdapter.java

@@ -0,0 +1,66 @@
+package com.blackforestbytes.simplecloudnotifier.view.debug;
+
+import android.content.Context;
+import android.graphics.Color;
+import androidx.annotation.NonNull;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+import com.blackforestbytes.simplecloudnotifier.R;
+import com.blackforestbytes.simplecloudnotifier.model.SingleQuery;
+
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+public class QueryLogAdapter extends ArrayAdapter<SingleQuery>
+{
+    public static DateTimeFormatter UI_FULLTIME_FORMATTER = DateTimeFormat.forPattern("HH:mm:ss");
+
+    public QueryLogAdapter(@NonNull Context context, @NonNull SingleQuery[] objects)
+    {
+        super(context, R.layout.adapter_querylog, objects);
+    }
+
+    @NonNull
+    @Override
+    public View getView(int position, View convertView, @NonNull ViewGroup parent)
+    {
+        View v = convertView;
+
+        if (v == null) {
+            LayoutInflater vi;
+            vi = LayoutInflater.from(getContext());
+            v = vi.inflate(R.layout.adapter_querylog, parent, false);
+        }
+
+        SingleQuery p = getItem(position);
+
+        if (p != null)
+        {
+            TextView tt1 = v.findViewById(R.id.list_item_debuglogrow_time);
+            if (tt1 != null) tt1.setText(p.Timestamp.toString(UI_FULLTIME_FORMATTER));
+            if (tt1 != null) tt1.setTextColor(Color.BLACK);
+
+            TextView tt2 = v.findViewById(R.id.list_item_debuglogrow_level);
+            if (tt2 != null) tt2.setText(p.Level.toUIString());
+            if (tt2 != null) tt2.setTextColor(Color.BLACK);
+
+            TextView tt3 = v.findViewById(R.id.list_item_debuglogrow_info);
+            if (tt3 != null) tt3.setText("");
+            if (tt3 != null) tt3.setTextColor(Color.BLUE);
+
+            TextView tt4 = v.findViewById(R.id.list_item_debuglogrow_id);
+            if (tt4 != null) tt4.setText(p.Name);
+            if (tt4 != null) tt4.setTextColor(p.Level.getColor());
+
+            TextView tt5 = v.findViewById(R.id.list_item_debuglogrow_message);
+            if (tt5 != null) tt5.setText(p.ExceptionString.length()> 40 ? p.ExceptionString.substring(0, 40-3)+"..." : p.ExceptionString);
+            if (tt5 != null) tt5.setTextColor(p.Level.getColor());
+        }
+
+        return v;
+    }
+}

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/debug/SingleQueryLogActivity.java

@@ -0,0 +1,38 @@
+package com.blackforestbytes.simplecloudnotifier.view.debug;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+import android.widget.TextView;
+
+import com.blackforestbytes.simplecloudnotifier.R;
+import com.blackforestbytes.simplecloudnotifier.lib.string.CompactJsonFormatter;
+import com.blackforestbytes.simplecloudnotifier.model.SingleQuery;
+
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+import java.util.Objects;
+
+public class SingleQueryLogActivity extends AppCompatActivity
+{
+    @Override
+    @SuppressLint("SetTextI18n")
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_singlequerylog);
+
+        SingleQuery q = SingleQuery.load(getIntent().getBundleExtra("query"), "data");
+
+        this.<TextView>findViewById(R.id.tvQL_Timestamp).setText(q.Timestamp.toString(DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss")));
+        this.<TextView>findViewById(R.id.tvQL_Level).setText(q.Level.toUIString());
+        this.<TextView>findViewById(R.id.tvQL_Level).setTextColor(q.Level.getColor());
+        this.<TextView>findViewById(R.id.tvQL_Name).setText(q.Name);
+        this.<TextView>findViewById(R.id.tvQL_URL).setText(q.URL.replace("?", "\r\n?").replace("&", "\r\n&"));
+        this.<TextView>findViewById(R.id.tvQL_Response).setText(CompactJsonFormatter.formatJSON(q.Response, 999));
+        this.<TextView>findViewById(R.id.tvQL_ResponseCode).setText(Integer.toString(q.ResponseCode));
+        this.<TextView>findViewById(R.id.tvQL_ExceptionString).setText(q.ExceptionString);
+    }
+}

android/app/src/main/res/drawable-mdpi/simple_black_border.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="@android:color/white" />
+    <stroke android:width="1dip" android:color="#888888"/>
+</shape>

android/app/src/main/res/drawable/ic_share_small.xml

@@ -0,0 +1,10 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12sp"
+    android:height="12sp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>

android/app/src/main/res/drawable/ic_trash_small.xml

@@ -0,0 +1,16 @@
+<vector
+    android:height="12sp"
+    android:width="12sp"
+    android:viewportHeight="53"
+    android:viewportWidth="53"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M42.943,6H33.5V3c0,-1.654 -1.346,-3 -3,-3h-8c-1.654,0 -3,1.346 -3,3v3h-9.443C8.096,6 6.5,7.596 6.5,9.557V14h2h36h2V9.557C46.5,7.596 44.904,6 42.943,6zM31.5,6h-10V3c0,-0.552 0.449,-1 1,-1h8c0.551,0 1,0.448 1,1V6z"/>
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M8.5,49.271C8.5,51.327 10.173,53 12.229,53h28.541c2.057,0 3.729,-1.673 3.729,-3.729V16h-36V49.271z"/>
+
+</vector>

android/app/src/main/res/layout/activity_main.xml

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    android:id="@+id/layoutRoot"
+<RelativeLayout android:id="@+id/layoutRoot"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:showIn="@layout/activity_main">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
+        app:titleTextColor="@color/colorOnPrimary"
         android:background="?attr/colorPrimary"
         android:elevation="6dp"
-        android:minHeight="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+        android:minHeight="?attr/actionBarSize" />
 
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tab_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/toolbar"
+        app:titleTextColor="@color/colorOnPrimary"
+        app:tabTextColor="@color/colorOnPrimary"
+        app:tabSelectedTextColor="@color/colorSecondary"
         android:background="?attr/colorPrimary"
         android:elevation="6dp"
-        android:minHeight="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+        android:minHeight="?attr/actionBarSize" />
 
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager"

android/app/src/main/res/layout/activity_querylog.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    android:id="@+id/layoutRoot"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ListView
+        android:id="@+id/lvQueryList"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</RelativeLayout>

android/app/src/main/res/layout/activity_singlequerylog.xml

@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:padding="4sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:textAlignment="center"
+                android:textStyle="bold"
+                android:layout_margin="2dip"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:text="Server Query" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_margin="2dip"
+                android:layout_height="wrap_content"
+                android:layout_width="100dp"
+                android:text="Timestamp" />
+
+            <com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView
+                app:maxHeightOverride="100"
+                android:background="@drawable/simple_black_border"
+                android:layout_margin="2dip"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fillViewport="true">
+
+                <TextView
+                    android:id="@+id/tvQL_Timestamp"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:padding="1dip"
+                    android:textIsSelectable="true"
+                    android:text="" />
+
+            </com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_margin="2dip"
+                android:layout_height="wrap_content"
+                android:layout_width="100dp"
+                android:text="Level" />
+
+            <com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView
+                app:maxHeightOverride="100"
+                android:background="@drawable/simple_black_border"
+                android:layout_margin="2dip"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fillViewport="true">
+
+                <TextView
+                    android:id="@+id/tvQL_Level"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:padding="1dip"
+                    android:textIsSelectable="true"
+                    android:text="" />
+
+            </com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_margin="2dip"
+                android:layout_height="wrap_content"
+                android:layout_width="100dp"
+                android:text="Name" />
+
+            <com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView
+                app:maxHeightOverride="100"
+                android:layout_margin="2dip"
+                android:background="@drawable/simple_black_border"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fillViewport="true">
+
+                <TextView
+                    android:id="@+id/tvQL_Name"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:padding="1dip"
+                    android:textIsSelectable="true"
+                    android:text="" />
+
+            </com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_margin="2dip"
+                android:layout_height="wrap_content"
+                android:layout_width="100dp"
+                android:text="URL" />
+
+            <com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView
+                app:maxHeightOverride="100"
+                android:layout_margin="2dip"
+                android:background="@drawable/simple_black_border"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fillViewport="true">
+
+                <TextView
+                    android:id="@+id/tvQL_URL"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:padding="1dip"
+                    android:textIsSelectable="true"
+                    android:text=""/>
+
+            </com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_margin="2dip"
+                android:layout_height="wrap_content"
+                android:layout_width="100dp"
+                android:text="ResponeCode" />
+
+            <com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView
+                app:maxHeightOverride="64"
+                android:layout_margin="2dip"
+                android:background="@drawable/simple_black_border"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fillViewport="true">
+
+                <TextView
+                    android:id="@+id/tvQL_ResponseCode"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:padding="1dip"
+                    android:textIsSelectable="true"
+                    android:text="" />
+
+            </com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_margin="2dip"
+                android:layout_height="wrap_content"
+                android:layout_width="100dp"
+                android:text="Response" />
+
+
+            <com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView
+                app:maxHeightOverride="100"
+                android:layout_margin="2dip"
+                android:background="@drawable/simple_black_border"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fillViewport="true">
+
+                <TextView
+                    android:id="@+id/tvQL_Response"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:padding="1dip"
+                    android:textIsSelectable="true"
+                    android:text="" />
+
+            </com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_margin="2dip"
+                android:layout_height="wrap_content"
+                android:layout_width="100dp"
+                android:text="Exception" />
+
+            <com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView
+                app:maxHeightOverride="100"
+                android:layout_margin="2dip"
+                android:background="@drawable/simple_black_border"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fillViewport="true">
+
+                <TextView
+                    android:id="@+id/tvQL_ExceptionString"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:padding="1dip"
+                    android:textIsSelectable="true"
+                    android:text="" />
+
+            </com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</FrameLayout>

android/app/src/main/res/layout/adapter_querylog.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/list_item_imagerow"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal" >
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="96dp"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/list_item_debuglogrow_time"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/list_item_debuglogrow_level"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/list_item_debuglogrow_info"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/list_item_debuglogrow_id"
+            android:textStyle="bold"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/list_item_debuglogrow_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+
+</LinearLayout>

android/app/src/main/res/layout/fragment_account.xml

@@ -198,19 +198,27 @@
             app:layout_constraintBottom_toTopOf="@+id/btnAccountReset"
             app:layout_constraintTop_toBottomOf="@+id/ic_img_quota" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnAccountReset"
+            app:cornerRadius="0dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp"
+            android:backgroundTint="#fa315b"
             android:text="@string/str_reset_account"
             app:layout_constraintBottom_toTopOf="@+id/btnClearLocalStorage" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnClearLocalStorage"
+            app:cornerRadius="0dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Clear Messages"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp"
+            android:backgroundTint="#607D8B"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

android/app/src/main/res/layout/fragment_settings.xml

@@ -95,6 +95,46 @@
                     android:layout_height="wrap_content"
                     android:minHeight="48dp" />
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="2dp"
+                    android:layout_marginTop="2dp"
+                    android:background="#c0c0c0"/>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="4dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="48dp">
+
+                    <TextView
+                        android:id="@+id/tvPreviewLineCount"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:text="@string/str_previewlinecount"
+                        android:textColor="#000"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/prefPreviewLineCount"
+                        app:layout_constraintHorizontal_bias="0"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <EditText
+                        android:minWidth="64dp"
+                        android:id="@+id/prefPreviewLineCount"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:inputType="number"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        android:importantForAutofill="no"
+                        tools:ignore="LabelFor,UnusedAttribute" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
@@ -111,8 +151,10 @@
                     android:gravity="center|center"
                     android:minHeight="48dp">
 
-                    <Button
+                    <com.google.android.material.button.MaterialButton
                         android:id="@+id/prefUpgradeAccount"
+                        app:cornerRadius="0dp"
+                        android:backgroundTint="#4CAF50"
                         android:text="@string/str_upgrade_account"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
@@ -763,6 +805,24 @@
 
         </androidx.cardview.widget.CardView>
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/prefExport"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="12dp"
+            app:cornerRadius="0dp"
+            android:backgroundTint="#444444"
+            android:text="@string/export_settings" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/prefImport"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="12dp"
+            app:cornerRadius="0dp"
+            android:backgroundTint="#666666"
+            android:text="@string/import_settings" />
+
     </LinearLayout>
 
 </ScrollView>

android/app/src/main/res/layout/message_card.xml

@@ -108,6 +108,43 @@
                     android:paddingTop="3dp"
                     android:contentDescription="@string/desc_priority_icon" />
 
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnShare"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    app:cornerRadius="0dp"
+                    app:icon="@drawable/ic_share_small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="25dp"
+                    android:layout_marginEnd="8sp"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
+                    android:insetLeft="0dp"
+                    android:insetRight="0dp"
+                    android:textSize="12sp"
+                    card_view:layout_constraintTop_toBottomOf="@id/tvMessage"
+                    app:layout_constraintRight_toLeftOf="@id/btnDelete"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    android:backgroundTint="#03A9F4"
+                    android:text="Share" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnDelete"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    app:cornerRadius="0dp"
+                    app:icon="@drawable/ic_trash_small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="25dp"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
+                    android:insetLeft="0dp"
+                    android:insetRight="0dp"
+                    android:textSize="12sp"
+                    card_view:layout_constraintTop_toBottomOf="@id/tvMessage"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    android:backgroundTint="#F44336"
+                    android:text="Delete"/>
+
             </androidx.constraintlayout.widget.ConstraintLayout>
 
         </androidx.cardview.widget.CardView>

android/app/src/main/res/values/attrs.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="MaxHeightScrollView">
+        <attr name="maxHeightOverride" format="integer" />
+    </declare-styleable>
+
+</resources>

android/app/src/main/res/values/colors.xml

@@ -6,6 +6,9 @@
     <color name="colorHeader">#3F51B5</color>
     <color name="colorHeaderForeground">#FFFFFF</color>
 
+    <color name="colorOnPrimary">#ecf0f1</color>
+    <color name="colorSecondary">#FF5722</color>
+
     <color name="colorBlack">#000</color>
 
     <color name="bg_row_background">#fa315b</color>

android/app/src/main/res/values/dimens.xml

@@ -6,4 +6,5 @@
     <dimen name="padd_10">10dp</dimen>
     <dimen name="ic_delete">30dp</dimen>
     <dimen name="thumbnail">90dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
 </resources>

android/app/src/main/res/values/strings.xml

@@ -30,9 +30,13 @@
     <string name="str_enable_vibration">Enable notification vibration</string>
     <string name="str_upgrade_account">Upgrade account</string>
     <string name="str_deleteswipe">Delete messages by swiping left</string>
+    <string name="str_previewlinecount">Number of visibile lines in collapsed messages</string>
     <string name="str_promode">Thank you for supporting the app and using the pro mode</string>
     <string name="str_promode_info">Increase your daily quota, remove the ad banner and support the developer (that\'s me)</string>
     <string name="volume_icon">Volume icon</string>
     <string name="play_test_sound">Play test sound</string>
     <string name="delete">DELETE</string>
+    <string name="title_activity_query_log">QueryLogActivity</string>
+    <string name="import_settings">Import settings</string>
+    <string name="export_settings">Export settings</string>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -1,13 +1,20 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!--   your app branding color for the app bar -->
         <item name="colorPrimary">#3F51B5</item>
+
         <!--   darker variant for the status bar and contextual app bars -->
         <item name="colorPrimaryDark">#303F9F</item>
+
         <!--   theme UI controls like checkboxes and text fields -->
-        <item name="colorAccent">#FF4081</item>
+        <item name="colorAccent">#FF5722</item>
+        <item name="colorSecondary">#FF5722</item>
     </style>
 
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar" />
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.MaterialComponents.Light" />
+
 </resources>

android/app/src/main/res/xml/filepaths.xml

@@ -0,0 +1,7 @@
+<paths>
+    <files-path          path="/" name="files" />
+    <cache-path          path="/" name="cache" />
+    <external-path       path="/" name="external" />
+    <external-files-path path="/" name="external-files" />
+    <external-cache-path path="/" name="external-cache" />
+</paths>

android/app/version.properties

@@ -1,3 +1,3 @@
-#Mon Nov 19 18:43:09 CET 2018
-VERSION_NAME=1.1.0
-VERSION_CODE=15
+#Thu Mar 05 15:29:10 UTC 2020
+VERSION_NAME=1.8.0
+VERSION_CODE=23

android/build.gradle

@@ -7,8 +7,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.google.gms:google-services:4.2.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.google.gms:google-services:4.3.4'
     }
 }
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Sep 26 22:10:14 CEST 2018
+#Tue Nov 03 14:10:19 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

androidExportReader/.gitignore

@@ -0,0 +1,58 @@
+# Created by https://www.toptal.com/developers/gitignore/api/java,gradle
+# Edit at https://www.toptal.com/developers/gitignore?templates=java,gradle
+
+### Java ###
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+### Gradle ###
+.gradle
+**/build/
+!src/**/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Avoid ignore Gradle wrappper properties
+!gradle-wrapper.properties
+
+# Cache of project
+.gradletasknamecache
+
+# Eclipse Gradle plugin generated files
+# Eclipse Core
+.project
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+### Gradle Patch ###
+# Java heap dump
+*.hprof
+
+# End of https://www.toptal.com/developers/gitignore/api/java,gradle
+

androidExportReader/.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

androidExportReader/.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="18" />
+  </component>
+</project>

androidExportReader/.idea/gradle.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

androidExportReader/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,11 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="JavadocReference" enabled="true" level="WARNING" enabled_by_default="true" editorAttributes="WARNING_ATTRIBUTES" />
+    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+      <option name="processCode" value="true" />
+      <option name="processLiterals" value="true" />
+      <option name="processComments" value="true" />
+    </inspection_tool>
+  </profile>
+</component>

androidExportReader/.idea/jarRepositories.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+  </component>
+</project>

androidExportReader/.idea/misc.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_18" default="true" project-jdk-name="openjdk-18" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

androidExportReader/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

androidExportReader/build.gradle

@@ -0,0 +1,47 @@
+
+buildscript {
+    repositories {
+        gradlePluginPortal()
+    }
+    dependencies {
+        classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
+    }
+}
+
+plugins {
+    id 'java'
+    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id 'application'
+}
+
+group 'com.blackforestbytes'
+version '1.0-SNAPSHOT'
+
+repositories {
+    mavenCentral()
+    maven { url "https://jitpack.io" }
+}
+
+application {
+    mainClass = 'com.blackforestbytes.Main'
+}
+
+jar {
+    manifest {
+        attributes 'Main-Class': application.mainClass
+    }
+}
+
+tasks.jar {
+    manifest.attributes["Main-Class"] = application.mainClass
+}
+
+dependencies {
+    implementation 'com.github.RalleYTN:SimpleJSON:2.1.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
+}
+
+test {
+    useJUnitPlatform()
+}

androidExportReader/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

androidExportReader/gradlew

@@ -0,0 +1,240 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

androidExportReader/gradlew.bat

@@ -0,0 +1,91 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

androidExportReader/settings.gradle

@@ -0,0 +1,2 @@
+rootProject.name = 'androidExportReader'
+

androidExportReader/src/main/java/com/blackforestbytes/Main.java

@@ -0,0 +1,104 @@
+package com.blackforestbytes;
+
+import de.ralleytn.simple.json.JSONArray;
+import de.ralleytn.simple.json.JSONFormatter;
+import de.ralleytn.simple.json.JSONObject;
+
+import java.io.ObjectInputStream;
+import java.net.URI;
+import java.nio.file.FileSystems;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class Main {
+    @SuppressWarnings("unchecked")
+    public static void main(String[] args) {
+        if (args.length != 1) {
+            System.err.println("call with ./androidExportConvert scn_export.dat");
+            return;
+        }
+
+        try {
+
+            var path = FileSystems.getDefault().getPath(args[0]).normalize().toAbsolutePath().toUri().toURL();
+
+            ObjectInputStream stream = new ObjectInputStream(path.openStream());
+
+            Map<String, ?> d1 = new HashMap<>((Map<String, ?>)stream.readObject());
+            Map<String, ?> d2 = new HashMap<>((Map<String, ?>)stream.readObject());
+            Map<String, ?> d3 = new HashMap<>((Map<String, ?>)stream.readObject());
+            Map<String, ?> d4 = new HashMap<>((Map<String, ?>)stream.readObject());
+
+            stream.close();
+
+            JSONObject root = new JSONObject();
+
+            var subConfig = new JSONObject();
+            var subIAB = new JSONArray();
+            var subCMessageList = new JSONArray();
+            var subAcks = new JSONArray();
+            var subQueryLog = new JSONArray();
+
+            for (Map.Entry<String, ?> entry : d1.entrySet())
+            {
+                if (entry.getValue() instanceof String)  subConfig.put(entry.getKey(),    (String)entry.getValue());
+                if (entry.getValue() instanceof Boolean) subConfig.put(entry.getKey(),   (Boolean)entry.getValue());
+                if (entry.getValue() instanceof Float)   subConfig.put(entry.getKey(),     (Float)entry.getValue());
+                if (entry.getValue() instanceof Integer) subConfig.put(entry.getKey(),       (Integer)entry.getValue());
+                if (entry.getValue() instanceof Long)    subConfig.put(entry.getKey(),      (Long)entry.getValue());
+                if (entry.getValue() instanceof Set<?>)  subConfig.put(entry.getKey(), ((Set<String>)entry.getValue()).toArray());
+            }
+
+            for (int i = 0; i < (Integer)d2.get("c"); i++) {
+                var obj = new JSONObject();
+                obj.put("key", d2.get("["+i+"]->key"));
+                obj.put("value", d2.get("["+i+"]->value"));
+                subIAB.add(obj);
+            }
+
+            for (int i = 0; i < (Integer)d3.get("message_count"); i++) {
+                if (d3.get("message["+i+"].scnid") == null)
+                    throw new Exception("ONF");
+
+                var obj = new JSONObject();
+                obj.put("timestamp", d3.get("message["+i+"].timestamp"));
+                obj.put("title", d3.get("message["+i+"].title"));
+                obj.put("content", d3.get("message["+i+"].content"));
+                obj.put("priority", d3.get("message["+i+"].priority"));
+                obj.put("scnid", d3.get("message["+i+"].scnid"));
+                subCMessageList.add(obj);
+            }
+
+            subAcks.addAll(((Set<String>)d3.get("acks")).stream().map(p -> Long.decode("0x"+p)).toList());
+
+            for (int i = 0; i < (Integer)d4.get("history_count"); i++) {
+                if (d4.get("message["+(i+1000)+"].Name") == null)
+                    throw new Exception("ONF");
+
+                var obj = new JSONObject();
+                obj.put("Level", d4.get("message["+(i+1000)+"].Level"));
+                obj.put("Timestamp", d4.get("message["+(i+1000)+"].Timestamp"));
+                obj.put("Name", d4.get("message["+(i+1000)+"].Name"));
+                obj.put("URL", d4.get("message["+(i+1000)+"].URL"));
+                obj.put("Response", d4.get("message["+(i+1000)+"].Response"));
+                obj.put("ResponseCode", d4.get("message["+(i+1000)+"].ResponseCode"));
+                obj.put("ExceptionString", d4.get("message["+(i+1000)+"].ExceptionString"));
+                subQueryLog.add(obj);
+            }
+
+            root.put("config", subConfig);
+            root.put("iab", subIAB);
+            root.put("cmessagelist", subCMessageList);
+            root.put("acks", subAcks);
+            root.put("querylog", subQueryLog);
+
+            System.out.println(new JSONFormatter().format(root.toString()));
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+}

examples/scn_send.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @param string $title
+ * @param string $content
+ * @param int $priority
+ * @return bool
+ */
+function sendSCN($title, $content, $priority) {
+	global $config;
+
+	$data =
+	[
+		'user_id'  => '', //TODO set your userid
+		'user_key' => '', //TODO set your userkey
+		'title'    => $title,
+		'content'  => $content,
+		'priority' => $priority,
+	];
+
+	$ch = curl_init();
+
+	curl_setopt($ch, CURLOPT_URL, "https://simplecloudnotifier.blackforestbytes.com/send.php");
+	curl_setopt($ch, CURLOPT_POST, 1);
+	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($data));
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+	$result = curl_exec($ch);
+
+	curl_close($ch);
+	if ($result === false) return false;
+
+	$json = json_decode($result, true);
+	return $json['success'];
+}

examples/scn_send.sh

@@ -21,6 +21,7 @@ user_key="????????????????????????????????????????????????????????????????"
 
 title=$1
 content=""
+sendtime=$(date +%s)
 
 if [ "$#" -gt 1 ]; then
     content=$2
@@ -37,7 +38,7 @@ usr_msg_id=$(uuidgen)
 while true ; do
 
     curlresp=$(curl -s -o /dev/null -w "%{http_code}" \
-                    -d "user_id=$user_id" -d "user_key=$user_key" -d "title=$title" \
+                    -d "user_id=$user_id" -d "user_key=$user_key" -d "title=$title" -d "timestamp=$sendtime" \
                     -d "content=$content" -d "priority=$priority" -d "msg_id=$usr_msg_id" \
                     https://scn.blackforestbytes.com/send.php)
     

flutter/.gitignore

@@ -0,0 +1,56 @@
+
+
+*.keystore
+
+firepit-log.txt
+flutter_jank_*
+
+
+#######################################################################################################################
+
+
+
+
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.pub-cache/
+.pub/
+/build/
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release

flutter/.metadata

@@ -0,0 +1,45 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: "41456452f29d64e8deb623a3c927524bcf9f111b"
+  channel: "stable"
+
+project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
+      base_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
+    - platform: android
+      create_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
+      base_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
+    - platform: ios
+      create_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
+      base_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
+    - platform: linux
+      create_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
+      base_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
+    - platform: macos
+      create_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
+      base_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
+    - platform: web
+      create_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
+      base_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
+    - platform: windows
+      create_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
+      base_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

flutter/.vscode/launch.json

@@ -0,0 +1,25 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "flutter",
+            "request": "launch",
+            "type": "dart"
+        },
+        {
+            "name": "flutter (profile mode)",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "profile"
+        },
+        {
+            "name": "flutter (release mode)",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "release"
+        }
+    ]
+}

flutter/Makefile

@@ -0,0 +1,18 @@
+
+
+run:
+	dart run build_runner build
+	flutter run
+	
+test:
+	dart analyze
+
+fix:
+	dart fix --apply
+
+gen:
+	dart run build_runner build
+	
+autoreload:
+	@# run `make run` in another terminal (or another variant of flutter run)
+	@_utils/autoreload.sh

flutter/README.md

@@ -0,0 +1,17 @@
+### Links
+
+
+ - https://pub.dev/packages/font_awesome_flutter
+ - https://fontawesome.com/search
+
+ - https://docs.flutter.dev/ui/widgets
+ - https://docs.flutter.dev/ui/widgets/material
+
+ - https://docs.flutter.dev/cookbook/persistence/sqlite
+ - https://pub.dev/packages/sqflite
+ - https://pub.dev/packages/sqflite_common_ffi
+ 
+ - https://pub.dev/packages/hive
+
+
+ 

flutter/TODO.md

@@ -0,0 +1,40 @@
+
+# TODO
+
+ - [ ] Message List
+        * [ ] CRUD
+ - [ ] Message Big-View
+ - [ ] Search/Filter Messages
+ - [ ] Channel List
+        * [ ] Show subs
+        * [ ] CRUD
+        * [ ] what about unsubbed foreign channels? - thex should still be visible (or should they, do i still get the messages?)
+ - [ ] Sub List
+        * [ ] Sub/Unsub/Accept/Deny
+ - [ ] Debug List (Show logs, requests)
+ - [ ] Key List
+        * [ ] CRUD
+ - [ ] Auto R-only key for admin, use for QR+link+send
+ - [ ] settings
+ - [ ] notifications
+ - [ ] push navigation stack
+ - [ ] read + migrate old SharedPrefs (or not? - who uses SCN even??)
+ - [ ] Account-Page
+ - [ ] Logout
+ - [ ] Send-page
+
+ 
+ -----
+
+ - [ ] Switch server to sq style from faby
+        - [ ] switch from mattn to go-sqlite
+        - [ ] Single struct for model/db/json
+        - [ ] use sq.Query | sq.Update | sq.InsertAndQuery | ....
+        - [ ] sq.DBOptions - enable CommentTrimmer and DefaultConverter
+        - [ ] run unit-tests...
+        - [ ] Copy db.Migrate code
+
+ - [ ] Disable compat | remove code 
+        - [x] compat message title
+        - [ ] ...
+ - [ ] RWLock directly in go - prevent/reduce db-locked exception

flutter/_utils/autoreload.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+    # shellcheck disable=SC2002  # disable useless-cat warning
+
+    set -o nounset   # disallow usage of unset vars  ( set -u )
+    set -o errexit   # Exit immediately if a pipeline returns non-zero.  ( set -e )
+    set -o errtrace  # Allow the above trap be inherited by all functions in the script.  ( set -E )
+    set -o pipefail  # Return value of a pipeline is the value of the last (rightmost) command to exit with a non-zero status
+    IFS=$'\n\t'      # Set $IFS to only newline and tab.
+
+    # shellcheck disable=SC2034
+    cr=$'\n'
+
+    function black() { if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[30m$1\\x1B[0m"; else echo "$1"; fi  }
+    function red()   { if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[31m$1\\x1B[0m"; else echo "$1"; fi; }
+    function green() { if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[32m$1\\x1B[0m"; else echo "$1"; fi; }
+    function yellow(){ if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[33m$1\\x1B[0m"; else echo "$1"; fi; }
+    function blue()  { if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[34m$1\\x1B[0m"; else echo "$1"; fi; }
+    function purple(){ if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[35m$1\\x1B[0m"; else echo "$1"; fi; }
+    function cyan()  { if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[36m$1\\x1B[0m"; else echo "$1"; fi; }
+    function white() { if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[37m$1\\x1B[0m"; else echo "$1"; fi; }
+
+    # cd "$(dirname "$0")" || exit 1  # (optionally) cd to directory where script is located
+
+
+
+pid="$( pgrep -f 'flutter_tools\.[s]napshot run' || echo '' | tail -n 1 )"
+
+if [ -z "$pid" ]; then
+    red "No [flutter run] process found - exiting"
+    exit 1
+fi
+
+trap 'echo "reseived SIGNAL<EXIT> - exiting"; exit 0' EXIT
+trap 'echo "reseived SIGNAL<SIGINT> - exiting"; exit 0' SIGINT
+trap 'echo "reseived SIGNAL<SIGTERM> - exiting"; exit 0' SIGTERM
+trap 'echo "reseived SIGNAL<SIGQUIT> - exiting"; exit 0' SIGQUIT
+
+echo ""
+blue "Listening for changes in lib/ directory - sending signals to ${pid}..."
+echo ""
+
+while true; do
+    find lib/ -name '*.dart' | entr -d -p sh -c "echo 'File(s) changed - Sending SIGUSR to $pid' ; kill -USR1 $pid";
+	yellow 'File list changed - restart';
+done

flutter/analysis_options.yaml

@@ -0,0 +1,117 @@
+
+include: 
+ - package:lints/recommended.yaml
+ - package:flutter_lints/flutter.yaml
+
+linter:
+  
+  
+  rules:
+    always_use_package_imports: true,
+    avoid_empty_else: true,
+    avoid_returning_null_for_future: true,
+    avoid_type_to_string: true,
+    avoid_types_as_parameter_names: true,
+    avoid_web_libraries_in_flutter: true,
+    collection_methods_unrelated_type: true,
+    discarded_futures: true,
+    empty_statements: true,
+    hash_and_equals: true,
+    implicit_reopen: true,
+    invalid_case_patterns: true,
+    invariant_booleans: true,
+    no_duplicate_case_values: true,
+    no_logic_in_create_state: true,
+    no_self_assignments: true,
+    no_wildcard_variable_uses: true,
+    prefer_void_to_null: true,
+    unnecessary_statements: true,
+    valid_regexps: true,
+    always_declare_return_types: true,
+    always_put_control_body_on_new_line: true,
+    always_specify_types: true,
+    annotate_overrides: true,
+    annotate_redeclares: true,
+    avoid_annotating_with_dynamic: true,
+    avoid_function_literals_in_foreach_calls: true,
+    avoid_init_to_null: true,
+    avoid_null_checks_in_equality_operators: true,
+    avoid_renaming_method_parameters: true,
+    avoid_return_types_on_setters: true,
+    avoid_returning_null: true,
+    avoid_returning_null_for_void: true,
+    avoid_returning_this: true,
+    avoid_shadowing_type_parameters: true,
+    avoid_single_cascade_in_expression_statements: true,
+    avoid_unnecessary_containers: true,
+    avoid_unused_constructor_parameters: true,
+    avoid_void_async: true,
+    await_only_futures: true,
+    camel_case_extensions: true,
+    camel_case_types: true,
+    cast_nullable_to_non_nullable: true,
+    constant_identifier_names: true,
+    empty_catches: true,
+    eol_at_end_of_file: true,
+    exhaustive_cases: true,
+    file_names: true,
+    no_literal_bool_comparisons: true,
+    null_check_on_nullable_type_parameter: true,
+    null_closures: true,
+    overridden_fields: true,
+    prefer_adjacent_string_concatenation: true,
+    prefer_collection_literals: true,
+    prefer_conditional_assignment: true,
+    prefer_const_constructors: true,
+    prefer_const_constructors_in_immutables: true,
+    prefer_const_declarations: true,
+    prefer_const_literals_to_create_immutables: true,
+    prefer_contains: true,
+    prefer_final_fields: true,
+    prefer_for_elements_to_map_fromIterable: true,
+    prefer_function_declarations_over_variables: true,
+    prefer_generic_function_type_aliases: true,
+    prefer_if_null_operators: true,
+    prefer_initializing_formals: true,
+    prefer_inlined_adds: true,
+    prefer_interpolation_to_compose_strings: true,
+    prefer_is_empty: true,
+    prefer_is_not_empty: true,
+    prefer_is_not_operator: true,
+    prefer_iterable_whereType: true,
+    prefer_null_aware_operators: true,
+    prefer_spread_collections: true,
+    prefer_typing_uninitialized_variables: true,
+    provide_deprecation_message: true,
+    recursive_getters: true,
+    sized_box_for_whitespace: true,
+    type_init_formals: true,
+    type_literal_in_constant_pattern: true,
+    unnecessary_const: true,
+    unnecessary_constructor_name: true,
+    unnecessary_getters_setters: true,
+    unnecessary_late: true,
+    unnecessary_new: true,
+    unnecessary_null_aware_assignments: true,
+    unnecessary_null_in_if_null_operators: true,
+    unnecessary_nullable_for_final_variable_declarations: true,
+    unnecessary_overrides: true,
+    unnecessary_string_escapes: true,
+    unnecessary_string_interpolations: true,
+    unnecessary_this: true,
+    unnecessary_to_list_in_spreads: true,
+    use_full_hex_values_for_flutter_colors: true,
+    use_function_type_syntax_for_parameters: true,
+    use_rethrow_when_possible: true,
+    use_string_in_part_of_directives: true,
+    use_super_parameters: true,
+    void_checks: true,
+    depend_on_referenced_packages: true,
+    package_names: true,
+    secure_pubspec_urls: true,
+    
+analyzer:
+  language:
+    strict-casts: true
+    strict-inference: true
+    strict-raw-types: true

flutter/android/.gitignore

@@ -0,0 +1,13 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+key.properties
+**/*.keystore
+**/*.jks

flutter/android/app/build.gradle

@@ -0,0 +1,80 @@
+plugins {
+    id "com.android.application"
+    // START: FlutterFire Configuration
+    id 'com.google.gms.google-services'
+    // END: FlutterFire Configuration
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
+def localProperties = new Properties()
+def localPropertiesFile = rootProject.file('local.properties')
+if (localPropertiesFile.exists()) {
+    localPropertiesFile.withReader('UTF-8') { reader ->
+        localProperties.load(reader)
+    }
+}
+
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+   keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
+android {
+    namespace "com.blackforestbytes.simplecloudnotifier"
+    compileSdkVersion flutter.compileSdkVersion
+    ndkVersion flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
+
+    defaultConfig {
+        applicationId "com.blackforestbytes.simplecloudnotifier"
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion flutter.targetSdkVersion
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
+    }
+
+    signingConfigs {
+      release {
+         keyAlias keystoreProperties['keyAlias']
+         keyPassword keystoreProperties['keyPassword']
+         storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+         storePassword keystoreProperties['storePassword']
+      }
+    }
+
+    buildTypes {
+        release {
+            signingConfig signingConfigs.release
+        }
+    }
+}
+
+flutter {
+    source '../..'
+}
+
+dependencies {}

flutter/android/app/google-services.json

@@ -0,0 +1,56 @@
+{
+  "project_info": {
+    "project_number": "232728961679",
+    "firebase_url": "https://simplecloudnotifier-ea7ef.firebaseio.com",
+    "project_id": "simplecloudnotifier-ea7ef",
+    "storage_bucket": "simplecloudnotifier-ea7ef.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:232728961679:android:23c75317f79601c9",
+        "android_client_info": {
+          "package_name": "com.blackforestbytes.simplecloudnotifier"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "232728961679-o7gig6f684mp1l1ok7719v3jf3csejc1.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.blackforestbytes.simplecloudnotifier",
+            "certificate_hash": "3bcafbd39256422f0cb51fd446a228c26543afb4"
+          }
+        },
+        {
+          "client_id": "232728961679-t1h2eo5keha2lrvhsvdr5kgbkbfkja0o.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBasR6JLAjM5Ut0rPb0euE_9DdDoTkcvKQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "232728961679-f2951kg24ngsttkhd96qhcr8j3lc8nnk.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "232728961679-bsbtc6orskaqafc8gtsuqia53f6ree48.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "com.blackforestbytes.SimpleCloudNotifier",
+                "app_store_id": "6455594868"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

flutter/android/app/src/debug/AndroidManifest.xml

@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>

flutter/android/app/src/main/AndroidManifest.xml

@@ -0,0 +1,40 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="com.android.vending.BILLING" />
+
+    <application
+        android:label="simplecloudnotifier"
+        android:name="${applicationName}"
+        android:icon="@mipmap/ic_launcher">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
+            android:windowSoftInputMode="adjustResize">
+            <!-- Specifies an Android theme to apply to this Activity as soon as
+                 the Android process has started. This theme is visible to the user
+                 while the Flutter UI initializes. After that, this theme continues
+                 to determine the Window background behind the Flutter UI. -->
+            <meta-data
+              android:name="io.flutter.embedding.android.NormalTheme"
+              android:resource="@style/NormalTheme"
+              />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+        <!-- Don't delete the meta-data below.
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
+    </application>
+</manifest>

flutter/android/app/src/main/kotlin/com/example/simplecloudnotifier/MainActivity.kt

@@ -0,0 +1,6 @@
+package com.blackforestbytes.simplecloudnotifier
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity() {
+}

flutter/android/app/src/main/res/drawable-v21/launch_background.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>

flutter/android/app/src/main/res/drawable/launch_background.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/white" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>

flutter/android/app/src/main/res/values-night/styles.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

flutter/android/app/src/main/res/values/styles.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

flutter/android/app/src/profile/AndroidManifest.xml

@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>

flutter/android/build.gradle

@@ -0,0 +1,30 @@
+buildscript {
+    ext.kotlin_version = '1.7.10'
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.buildDir = '../build'
+subprojects {
+    project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
+    project.evaluationDependsOn(':app')
+}
+
+tasks.register("clean", Delete) {
+    delete rootProject.buildDir
+}

flutter/android/gradle.properties

@@ -0,0 +1,3 @@
+org.gradle.jvmargs=-Xmx4G
+android.useAndroidX=true
+android.enableJetifier=true

flutter/android/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

flutter/android/settings.gradle

@@ -0,0 +1,32 @@
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
+
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+
+    plugins {
+        id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
+    }
+}
+
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.3.0" apply false
+    // START: FlutterFire Configuration
+    id "com.google.gms.google-services" version "4.3.15" apply false
+    // END: FlutterFire Configuration
+}
+
+include ":app"

flutter/deps/font_awesome_flutter/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

flutter/deps/font_awesome_flutter/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

flutter/deps/font_awesome_flutter/.github/ISSUE_TEMPLATE/missing-icon.md

@@ -0,0 +1,12 @@
+---
+name: Missing Icon
+about: Handles Requests for Missing Icons
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Before submitting this issue, please double-check if the icon is a pro icon on the Font Awesome website. It will say something like "Start using this pro icon."
+
+This package only includes the free icons by default. To use pro icons, you must purchase a license and follow the instructions found in the README.md file.

flutter/deps/font_awesome_flutter/.gitignore

@@ -0,0 +1,12 @@
+.DS_Store
+.atom/
+.idea
+.packages
+.dart_tool/
+.pub/
+build/
+ios/.generated/
+packages
+pubspec.lock
+.flutter-plugins
+local.properties

flutter/deps/font_awesome_flutter/CHANGELOG.md

@@ -0,0 +1,175 @@
+## 10.7.0
+* Upgrade to Font Awesome 6.5.1
+
+## 10.6.0
+* Upgrade to Font Awesome 6.4.2
+* Add @staticIconProvider annotation
+* Add `shadows` property to FaIcon - thanks @RomainFranceschini!
+
+## 10.5.1
+* Hotfix #244 - regular font still used
+* Update package description icon count
+
+## 10.5.0
+* Fix #244 - dynamic icon retrieval requires regular font
+  * BREAKING: getIconFromCss now returns null if no matching icon is found
+* Upgrade to Font Awesome 6.4.0
+* Migrate to Flutter 3 - thanks @jinosh05
+
+## 10.4.0
+* Upgrade to Font Awesome 6.3.0
+* Fix: doc misspells function - thanks @ulrikkold !
+
+## 10.3.0
+* Upgrade to Font Awesome 6.2.1
+* Fix #227: fix deprecated isAlwaysShown property
+
+## 10.2.1
+* Update font awesome version in readme
+
+## 10.2.0
+* Remove duotone generator functionality from configurator
+* Upgrade to Font Awesome 6.2.0
+
+## 10.1.0
+* Upgrade to Font Awesome 6.1.1
+* Perform automatic update check on configurator run
+
+## 10.0.0
+* Upgrade to Font Awesome icons 6.1.0
+* Update the configurator to work with version 6
+* Add alias support
+  (Aliases may be old names of renamed icons.
+  Since it is unclear if they are about to stay,
+  aliases are marked as @Deprecated with a message containing the new icon name.)
+* Update FaIcon with the latest changes to flutter's default Icon
+* DEPRECATE duotone icon support for pro users
+* Fix linter warnings - thanks to @gslender!
+
+## 9.2.0
+* Upgrade to Font Awesome icons 5.15.4
+* Equalize windows and linux tool scripts
+* Reworked updater tool into a full-fledged configurator
+  * Added support for ignoring styles
+  * Added optional support for dynamic icon retrieval by name (thanks to @Mythar)
+  * Fonts get enabled/disabled automatically based on availability and exclude list
+
+## 9.1.0
+* Add support for fa6's 360-degrees icon
+* Fix #154 FaDuotoneIcon explicitly requires IconDataDuotone
+* Use `dart format` instead of deprecated `dartfmt` in the updater
+* Automatically enable duotone icons in the example if possible
+* Upgrade to Font Awesome icons 5.15.3
+
+Thanks to @amkuchta for his work and input
+
+## 9.0.0
+* Add support for null-safety
+
+## 8.12.0
+* Upgrade to Font Awesome icons 5.15.2
+* Add support for font awesome 6's number icons
+
+## 8.11.0
+  * Add support for font awesome 6's thin icons
+
+## 8.10.2
+  * Fix missing keys in FaDuotoneIcon
+  * Fix icon tree shaking build error for duotone icons
+
+## 8.10.1
+  * Update license file with MIT header
+  * Update readme links
+
+## 8.10.0
+  * Fix #119: Inverted colors for duotone icons
+  * Fix #122: Build failure due to missing glyphs in web fonts
+  * Upgrade to Font Awesome icons 5.15.1
+
+## 8.9.0
+  * Upgrade to Font Awesome icons 5.15
+
+## 8.8.1
+  * Fix icon_data.dart not being accessible
+
+## 8.8.0
+  * Upgrade to Font Awesome Icons 5.13
+
+## 8.7.0
+
+  * Add `FaIcon` widget for Font Awesome Icons
+  * Update `README` with FAQ
+
+## 8.6.0
+  * Move package to FlutterCommunity
+  * Upgrade to Font Awesome Icons 5.12.1
+  * Directions to support pro icons if you've purchased them (thanks @michaelspiss!)
+
+## 8.5.0
+  * Upgrade to Font Awesome Icons 5.9
+
+## 8.4.0
+
+  * FIX BAD BUILD - 8.3.0 had a problem with the update Script, please do not use!
+  * Upgrade to Font Awesome Icons 5.7 
+  
+## 8.3.0
+
+  * Upgrade to Font Awesome Icons 5.7
+
+## 8.2.0
+
+  * Upgrade to Font Awesome Icons 5.5
+  
+## 8.1.0
+
+  * Upgrade to Font Awesome Icons 5.3.1
+
+## 8.0.1
+
+  * Fix documentation
+  
+## 8.0.0
+
+  * Upgrade environment version constraint for Dart 2
+  * Upgrade to font awesome icons 5.2.0
+
+## 7.1.0
+
+  * Upgrade to font awesome icons 5.1.0
+
+## 7.0.0
+
+* Renames:
+  - All icons that end with capital-O (for outline) have been renamed. E.g. `addressBookO` has been renamed `addressBook` 
+  - All solid icons have been renamed to `solidIconName`. E.g. `addressBook` renamed `solidAddressBook`
+* Generate Icon pack based on JSON definition from source. Much easier upgrades / maintenance / consistency going forward! Big thanks to @pplante on Github for the contribution :)
+* Move fonts into the `lib` folder.
+  
+## 6.0.0
+
+* Update to Font Awesome Icons 5.0.2, which includes tons of new Icons!
+
+## 5.0.0
+
+* semver mistake: 4.7.3 should have been a major bump as it involves breaking changes.
+
+## 4.7.3
+
+* Simpler Install: Remove the need to specify the font in your own pubspec.yaml
+
+## 4.7.2
+
+* MOAR README updates
+
+## 4.7.1
+
+* README fix
+
+## 4.7.0
+
+* Expose Font Awesome 4.7.0 `woff` font asset. This was the smallest version of the font file that worked with Flutter. 
+* Created `FontAwesomeIcons` class, which provides static access to all Font Awesome 4.7.0 Icons as `IconData`, similar to Flutter's built-in `Icons` class.
+* Created a Gallery App that can be used to view all provided icons
+* Created README with installation instructions
+* Added LICENSE.md file

flutter/deps/font_awesome_flutter/LICENSE

@@ -0,0 +1,24 @@
+MIT License
+
+Copyright (c) 2017 Brian Egan
+Copyright (c) 2020 Michael Spiss
+Font Awesome Icons by @fontawesome - https://fontawesome.com
+License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

flutter/deps/font_awesome_flutter/README.md

@@ -0,0 +1,204 @@
+# font_awesome_flutter 
+
+[![Flutter Community: font_awesome_flutter](https://fluttercommunity.dev/_github/header/font_awesome_flutter)](https://github.com/fluttercommunity/community)
+
+[![Pub](https://img.shields.io/pub/v/font_awesome_flutter.svg)](https://pub.dartlang.org/packages/font_awesome_flutter)
+
+The *free* [Font Awesome](https://fontawesome.com/icons) Icon pack available 
+as set of Flutter Icons - based on font awesome version 6.5.1.
+
+This icon pack includes only the *free* icons offered by Font Awesome out-of-the-box.
+If you have purchased the pro icons and want to enable support for them, please see the instructions below.
+
+## Installation
+
+In the `dependencies:` section of your `pubspec.yaml`, add the following line:
+
+```yaml
+dependencies:
+  font_awesome_flutter: <latest_version>
+```
+
+## Usage
+
+```dart
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+
+class MyWidget extends StatelessWidget {
+  Widget build(BuildContext context) {
+    return IconButton(
+      // Use the FaIcon Widget + FontAwesomeIcons class for the IconData
+      icon: FaIcon(FontAwesomeIcons.gamepad), 
+      onPressed: () { print("Pressed"); }
+     );
+  }
+}
+```
+
+### Icon names
+
+Icon names equal those on the [official website](https://fontawesome.com/icons), but are written in lower camel case. If more than one icon style is available for an icon, the style name is used as prefix, except for "regular".
+Due to restrictions in dart, icons starting with numbers have those numbers written out.
+
+#### Examples:
+| Icon name                                                                             | Code | Style|
+|---------------------------------------------------------------------------------------| --- | ---|
+| [angle-double-up](https://fontawesome.com/icons/angle-double-up?style=solid)          | `FontAwesomeIcons.angleDoubleUp` | solid _(this icon does not have other free styles)_ |
+| [arrow-alt-circle-up](https://fontawesome.com/icons/arrow-alt-circle-up?style=regular) | `FontAwesomeIcons.arrowAltCircleUp` | regular |
+| [arrow-alt-circle-up](https://fontawesome.com/icons/arrow-alt-circle-up?style=solid)  |  `FontAwesomeIcons.solidArrowAltCircleUp` | solid |
+| [1](https://fontawesome.com/icons/1?style=solid)                                      | `FontAwesomeIcons.solidOne` | solid |
+
+## Example App
+
+View the Flutter app in the `example` directory to see all the available `FontAwesomeIcons`.
+
+## Customizing font awesome flutter
+
+We supply a configurator tool to assist you with common customizations to this package.
+All options are interoperable.
+By default, if run without arguments and no `icons.json` in `lib/fonts` exists, it updates all icons to the
+newest free version of font awesome.
+
+### Setup
+To use your custom version, you must first clone [this repository](https://github.com/fluttercommunity/font_awesome_flutter.git)
+to a location of your choice and run `flutter pub get` inside. This installs all dependencies.
+
+The configurator is located in the `util` folder and can be started by running `configurator.bat` on Windows, or 
+`./configurator.sh` on linux and mac. All following examples use the `.sh` version, but work same for `.bat`.
+(If on windows, omit the `./` or replace it with `.\`.)
+An overview of available options can be viewed with `./configurator.sh --help`.
+
+To use your customized version in an app, go to the app's `pubspec.yaml` and add a dependency for
+`font_awesome_flutter: '>= 4.7.0'`. Then override the dependency's location:
+```yaml
+dependencies:
+  font_awesome_flutter: '>= 4.7.0'
+  ...
+  
+dependency_overrides:
+  font_awesome_flutter:
+    path: path/to/your/font_awesome_flutter
+  ...
+```
+
+### Enable pro icons
+:exclamation: By importing pro icons you acknowledge that it is your obligation
+to keep these files private. This includes **not** uploading your package to
+a public github repository or other public file sharing services.
+
+* Go to the location of your custom font_awesome_flutter version (see [setup](#setup))
+* Download the web version of font awesome pro and open it
+* Move **all** `.ttf` files from the `webfonts` directory and `icons.json` from `metadata` to
+  `path/to/your/font_awesome_flutter/lib/fonts`. Replace existing files.
+* Run the configurator. It should say "Custom icons.json found"
+
+It may be required to run `flutter clean` in apps who use this version for changes to appear.
+
+### Excluding styles
+One or more styles can be excluded from all generation processes by passing them with the `--exclude` option:
+```
+$ ./configurator.sh --exclude solid
+$ ./configurator.sh --exclude solid,brands
+```
+
+See the [optimizations](#what-about-file-size-and-ram-usage) and [dynamic icon retrieval by name](#retrieve-icons-dynamically-by-their-name-or-css-class)
+sections for more information as to why it makes sense for your app.
+
+### Retrieve icons dynamically by their name or css class
+Probably the most requested feature after support for pro icons is the ability to retrieve an icon by their name.
+This was previously not possible, because a mapping from name to icon would break all
+[discussed optimizations](#what-about-file-size-and-ram-usage). Please bear in mind that this is still the case.
+As all icons could theoretically be requested, none can be removed by flutter. It is strongly advised to only use this
+option in conjunction with [a limited set of styles](#excluding-styles) and with as few of them as possible. You may
+need to build your app with the `--no-tree-shake-icons` flag for it to succeed.
+
+Using the new configurator tool, this is now an optional feature. Run the tool with the `--dynamic` flag to generate...
+```
+$ ./configurator.sh --dynamic
+```
+...and the following import to use the map. For normal icons, use `faIconNameMapping` with a key of this format:
+'style icon-name'.
+```dart
+import 'package:font_awesome_flutter/name_icon_mapping.dart';
+
+...
+    FaIcon(faIconNameMapping['solid abacus']);
+...
+```
+
+To exclude unused styles combine the configurator options:
+```
+$ ./configurator.sh --dynamic --exclude solid
+```
+
+
+A common use case also includes fetching css classes from a server. The utility function `getIconFromCss()` takes a
+string of classes and returns the icon which would be shown by a browser:
+```dart
+getIconFromCss('far custom-class fa-abacus'); // returns the abacus icon in regular style. custom-class is ignored
+```
+
+## Duotone icons
+
+Duotone support has been discontinued after font awesome changed the way they lay out the icon glyphs inside the font's
+file. The new way using ligatures is not supported by flutter at the moment.
+
+For more information on why duotone icon support was discontinued, see
+[this comment](https://github.com/fluttercommunity/font_awesome_flutter/issues/192#issuecomment-1073003668).
+
+## FAQ
+
+<details>
+  <summary><h3>Why aren't the icons aligned properly or why are the icons being cut off?</h3></summary>
+  Please use the `FaIcon` widget provided by the library instead of the `Icon`
+  widget provided by Flutter. The `Icon` widget assumes all icons are square, but
+  many Font Awesome Icons are not.
+</details>
+
+<details>
+  <summary><h3>What about file size and ram usage</h3></summary>
+  This package has been written in a way so that it only uses the minimum amount of resources required.
+
+  All links (eg. `FontAwesomeIcons.abacus`) to unused icons will be removed automatically, which means only required icon
+  definitions are loaded into ram.
+
+  Flutter 1.22 added icon tree shaking. This means unused icon "images" will be removed as well. However, this only
+  applies to styles of which at least one icon has been used. Assuming only icons of style "regular" are being used,
+  "regular" will be minified to only include the used icons and "solid" and "brands" will stay in their raw, complete
+  form. This issue is being [tracked over in the flutter repository](https://github.com/flutter/flutter/issues/64106).
+
+  However, using the configurator, you can easily exclude styles from the package. For more information, see
+  [customizing font awesome flutter](#customizing-font-awesome-flutter)
+</details>
+
+<details>
+  <summary><h3>Why aren't the icons showing up on Mobile devices?</h3></summary>
+  If you're not seeing any icons at all, sometimes it means that Flutter has a cached version of the app on device and
+  hasn't pushed the new fonts. I've run into that as well a few times...
+
+  Please try:
+
+  1. Stopping the app
+  2. Running `flutter clean` in your app directory
+  3. Deleting the app from your simulator / emulator / device
+  4. Rebuild & Deploy the app.
+</details>
+
+<details>
+  <summary><h3>Why aren't the icons showing up on Web?</h3></summary>
+  Most likely, the fonts were not correctly added to the `FontManifest.json`.
+  Note: older versions of Flutter did not properly package non-Material fonts
+  in the `FontManifest.json` during the build step, but that issue has been
+  resolved and this shouldn't be much of a problem these days.
+
+  Please ensure you are using `Flutter 1.14.6 beta` or newer! 
+</details>
+
+<details>
+  <summary><h3>Why does mac/linux not run the configurator?</h3></summary>
+  This is most probably due to missing file permissions. Downloaded scripts cannot be executed by default.
+  
+  Either give the execute permission to `util/configurator.sh` with `$ chmod +x configurator.sh` or run the commands by prepending an `sh`:
+  
+  `$ sh ./configurator.sh`
+</details>