From 8a49310eda1d92eb3b1520660d19a11879402595 Mon Sep 17 00:00:00 2001
From: Markus <markus-schwarz@onlinehome.de>
Date: Fri, 23 Jul 2021 22:44:52 +0200
Subject: [PATCH 1/7] Disable push message button if no application available
 on server

---
 .../java/com/github/gotify/sharing/ShareActivity.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/github/gotify/sharing/ShareActivity.java b/app/src/main/java/com/github/gotify/sharing/ShareActivity.java
index 065a096f..5ea72f92 100644
--- a/app/src/main/java/com/github/gotify/sharing/ShareActivity.java
+++ b/app/src/main/java/com/github/gotify/sharing/ShareActivity.java
@@ -6,6 +6,7 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.Toast;
@@ -46,6 +47,9 @@ public class ShareActivity extends AppCompatActivity {
     @BindView(R.id.appSpinner)
     Spinner appSpinner;
 
+    @BindView(R.id.push_button)
+    Button pushMessageButton;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -73,7 +77,11 @@ protected void onCreate(Bundle savedInstanceState) {
         ApiClient client =
                 ClientFactory.clientToken(settings.url(), settings.sslSettings(), settings.token());
         appsHolder = new ApplicationHolder(this, client);
-        appsHolder.onUpdate(() -> populateSpinner(appsHolder.get()));
+        appsHolder.onUpdate(() -> {
+            List<Application> apps = appsHolder.get();
+            populateSpinner(apps);
+            pushMessageButton.setEnabled(apps.size() > 0);
+        });
         appsHolder.request();
     }
 

From ade5e5bb8de966c5c4ab1d68f2b63bcfebcfafab Mon Sep 17 00:00:00 2001
From: Markus <markus-schwarz@onlinehome.de>
Date: Sat, 24 Jul 2021 11:07:24 +0200
Subject: [PATCH 2/7] Added info why the push message button is unavailable

---
 .../com/github/gotify/sharing/ShareActivity.java     | 11 ++++++++++-
 app/src/main/res/layout/activity_share.xml           | 12 ++++++++++++
 app/src/main/res/values/strings.xml                  |  1 +
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/github/gotify/sharing/ShareActivity.java b/app/src/main/java/com/github/gotify/sharing/ShareActivity.java
index 5ea72f92..27d226ae 100644
--- a/app/src/main/java/com/github/gotify/sharing/ShareActivity.java
+++ b/app/src/main/java/com/github/gotify/sharing/ShareActivity.java
@@ -9,6 +9,7 @@
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Spinner;
+import android.widget.TextView;
 import android.widget.Toast;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
@@ -50,6 +51,9 @@ public class ShareActivity extends AppCompatActivity {
     @BindView(R.id.push_button)
     Button pushMessageButton;
 
+    @BindView(R.id.infoMissingApps)
+    TextView missingAppsInfo;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -80,11 +84,16 @@ protected void onCreate(Bundle savedInstanceState) {
         appsHolder.onUpdate(() -> {
             List<Application> apps = appsHolder.get();
             populateSpinner(apps);
-            pushMessageButton.setEnabled(apps.size() > 0);
+            preventPushing(apps.size() == 0);
         });
         appsHolder.request();
     }
 
+    private void preventPushing(boolean prevent) {
+        pushMessageButton.setEnabled(!prevent);
+        missingAppsInfo.setVisibility(prevent ? View.VISIBLE : View.GONE);
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml
index 1c20d6bd..10eddcd6 100644
--- a/app/src/main/res/layout/activity_share.xml
+++ b/app/src/main/res/layout/activity_share.xml
@@ -81,6 +81,17 @@
             android:textSize="18sp" />
     </LinearLayout>
 
+    <TextView
+        android:id="@+id/infoMissingApps"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="20dp"
+        android:layout_marginBottom="20dp"
+        android:text="@string/push_missing_app_info"
+        android:textAlignment="center"
+        android:textColor="#BDBDBD"
+        android:visibility="gone" />
+
     <Button
         android:id="@+id/push_button"
         android:layout_width="match_parent"
@@ -89,4 +100,5 @@
         android:layout_marginBottom="20dp"
         android:layout_marginHorizontal="20dp"
         android:text="@string/push_button" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 046f20be..37fe9f48 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -81,5 +81,6 @@
     <string name="push_title_hint">Title</string>
     <string name="push_content_hint">Content</string>
     <string name="push_priority_hint">Priority</string>
+    <string name="push_missing_app_info">There are no applications available on the server\nto push a message to.</string>
     <string name="message_copied_to_clipboard">Content copied to clipboard</string>
 </resources>

From a9ff9609b3ecd042e209bc2c0147efb73d969fb5 Mon Sep 17 00:00:00 2001
From: Markus <markus-schwarz@onlinehome.de>
Date: Sat, 24 Jul 2021 20:59:59 +0200
Subject: [PATCH 3/7] Added scroll view to share activity

Now also working in landscape mode.
---
 app/src/main/res/layout/activity_share.xml | 167 +++++++++++----------
 1 file changed, 86 insertions(+), 81 deletions(-)

diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml
index 10eddcd6..35a10bfb 100644
--- a/app/src/main/res/layout/activity_share.xml
+++ b/app/src/main/res/layout/activity_share.xml
@@ -1,104 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
-    <include
-        layout="@layout/app_bar_drawer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <com.google.android.material.textfield.TextInputLayout
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="20dp">
+        android:orientation="vertical">
 
-        <EditText
-            android:id="@+id/title"
+        <include
+            layout="@layout/app_bar_drawer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:ems="10"
-            android:hint="@string/push_title_hint"
-            android:inputType="text"
-            android:singleLine="true" />
-    </com.google.android.material.textfield.TextInputLayout>
+            android:layout_margin="20dp">
 
-    <com.google.android.material.textfield.TextInputLayout
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="20dp"
-        android:layout_marginBottom="20dp">
+            <EditText
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:hint="@string/push_title_hint"
+                android:inputType="text"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/content"
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/push_content_hint"
-            android:inputType="textCapSentences|textMultiLine"
-            android:maxLength="2000"
-            android:maxLines="10" />
-    </com.google.android.material.textfield.TextInputLayout>
+            android:layout_marginHorizontal="20dp"
+            android:layout_marginBottom="20dp">
 
-    <com.google.android.material.textfield.TextInputLayout
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="20dp"
-        android:layout_marginBottom="20dp">
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/push_content_hint"
+                android:inputType="textCapSentences|textMultiLine"
+                android:maxLength="2000"
+                android:maxLines="10" />
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/edtTxtPriority"
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:digits="0123456789"
-            android:hint="@string/push_priority_hint"
-            android:imeOptions="actionDone"
-            android:inputType="numberSigned"
-            android:maxLength="3"
-            android:text="0" />
-    </com.google.android.material.textfield.TextInputLayout>
+            android:layout_marginHorizontal="20dp"
+            android:layout_marginBottom="20dp">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="20dp"
-        android:layout_marginBottom="20dp">
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/edtTxtPriority"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:digits="0123456789"
+                android:hint="@string/push_priority_hint"
+                android:imeOptions="actionDone"
+                android:inputType="numberSigned"
+                android:maxLength="3"
+                android:text="0" />
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <TextView
-            android:id="@+id/txtAppListDesc"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/appListDescription" />
+            android:layout_marginHorizontal="20dp"
+            android:layout_marginBottom="20dp">
 
-        <Spinner
-            android:id="@+id/appSpinner"
-            android:layout_width="wrap_content"
-            android:layout_height="50dp"
-            android:spinnerMode="dropdown"
-            android:textSize="18sp" />
-    </LinearLayout>
+            <TextView
+                android:id="@+id/txtAppListDesc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/appListDescription" />
 
-    <TextView
-        android:id="@+id/infoMissingApps"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="20dp"
-        android:layout_marginBottom="20dp"
-        android:text="@string/push_missing_app_info"
-        android:textAlignment="center"
-        android:textColor="#BDBDBD"
-        android:visibility="gone" />
+            <Spinner
+                android:id="@+id/appSpinner"
+                android:layout_width="wrap_content"
+                android:layout_height="50dp"
+                android:spinnerMode="dropdown"
+                android:textSize="18sp" />
+        </LinearLayout>
 
-    <Button
-        android:id="@+id/push_button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical|center_horizontal"
-        android:layout_marginBottom="20dp"
-        android:layout_marginHorizontal="20dp"
-        android:text="@string/push_button" />
+        <TextView
+            android:id="@+id/infoMissingApps"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="20dp"
+            android:layout_marginBottom="20dp"
+            android:text="@string/push_missing_app_info"
+            android:textAlignment="center"
+            android:visibility="gone" />
+
+        <Button
+            android:id="@+id/push_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|center_horizontal"
+            android:layout_marginBottom="20dp"
+            android:layout_marginHorizontal="20dp"
+            android:text="@string/push_button" />
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file

From c4ec270f789fbe1cb2db52c2d455ee22954df106 Mon Sep 17 00:00:00 2001
From: Markus <markus-schwarz@onlinehome.de>
Date: Sun, 25 Jul 2021 13:36:07 +0200
Subject: [PATCH 4/7] Disable push message button by default

So button is only enabled when received one or more apps successful
---
 .../java/com/github/gotify/sharing/ShareActivity.java  | 10 ++++------
 app/src/main/res/layout/activity_share.xml             |  3 ++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/github/gotify/sharing/ShareActivity.java b/app/src/main/java/com/github/gotify/sharing/ShareActivity.java
index 27d226ae..e1721171 100644
--- a/app/src/main/java/com/github/gotify/sharing/ShareActivity.java
+++ b/app/src/main/java/com/github/gotify/sharing/ShareActivity.java
@@ -84,16 +84,14 @@ protected void onCreate(Bundle savedInstanceState) {
         appsHolder.onUpdate(() -> {
             List<Application> apps = appsHolder.get();
             populateSpinner(apps);
-            preventPushing(apps.size() == 0);
+
+            boolean appsAvailable = apps.size() > 0;
+            pushMessageButton.setEnabled(appsAvailable);
+            missingAppsInfo.setVisibility(appsAvailable ? View.GONE : View.VISIBLE);
         });
         appsHolder.request();
     }
 
-    private void preventPushing(boolean prevent) {
-        pushMessageButton.setEnabled(!prevent);
-        missingAppsInfo.setVisibility(prevent ? View.VISIBLE : View.GONE);
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml
index 35a10bfb..30d901fc 100644
--- a/app/src/main/res/layout/activity_share.xml
+++ b/app/src/main/res/layout/activity_share.xml
@@ -101,8 +101,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|center_horizontal"
-            android:layout_marginBottom="20dp"
             android:layout_marginHorizontal="20dp"
+            android:layout_marginBottom="20dp"
+            android:enabled="false"
             android:text="@string/push_button" />
 
     </LinearLayout>

From a3cc9c7e45fb2178a355e8fbe21dea965c8ca036 Mon Sep 17 00:00:00 2001
From: Markus <markus-schwarz@onlinehome.de>
Date: Sun, 25 Jul 2021 19:41:30 +0200
Subject: [PATCH 5/7] Added info icon to message

Some formatting
---
 .../github/gotify/sharing/ShareActivity.java  |  6 ++--
 app/src/main/res/drawable/ic_info.xml         |  9 +++++
 app/src/main/res/layout/activity_share.xml    | 35 ++++++++++++++++---
 app/src/main/res/values/strings.xml           |  2 +-
 4 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_info.xml

diff --git a/app/src/main/java/com/github/gotify/sharing/ShareActivity.java b/app/src/main/java/com/github/gotify/sharing/ShareActivity.java
index e1721171..6055c9b8 100644
--- a/app/src/main/java/com/github/gotify/sharing/ShareActivity.java
+++ b/app/src/main/java/com/github/gotify/sharing/ShareActivity.java
@@ -8,8 +8,8 @@
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.Spinner;
-import android.widget.TextView;
 import android.widget.Toast;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
@@ -51,8 +51,8 @@ public class ShareActivity extends AppCompatActivity {
     @BindView(R.id.push_button)
     Button pushMessageButton;
 
-    @BindView(R.id.infoMissingApps)
-    TextView missingAppsInfo;
+    @BindView(R.id.missingAppsContainer)
+    LinearLayout missingAppsInfo;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
new file mode 100644
index 00000000..8da7666d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/icons"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml
index 30d901fc..333fd1ed 100644
--- a/app/src/main/res/layout/activity_share.xml
+++ b/app/src/main/res/layout/activity_share.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
     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">
 
@@ -86,15 +87,39 @@
                 android:textSize="18sp" />
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/infoMissingApps"
+        <LinearLayout
+            android:id="@+id/missingAppsContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="20dp"
             android:layout_marginBottom="20dp"
-            android:text="@string/push_missing_app_info"
-            android:textAlignment="center"
-            android:visibility="gone" />
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:paddingStart="10dp"
+            android:paddingEnd="10dp"
+            android:visibility="gone">
+
+            <ImageView
+                android:id="@+id/missingAppsIcon"
+                android:layout_width="40dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0"
+                app:srcCompat="@drawable/ic_info" />
+
+            <Space
+                android:layout_width="10dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0" />
+
+            <TextView
+                android:id="@+id/missingAppsText"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_weight="0"
+                android:text="@string/push_missing_app_info"
+                android:textAlignment="center"
+                android:visibility="visible" />
+        </LinearLayout>
 
         <Button
             android:id="@+id/push_button"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 37fe9f48..4fea115d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -81,6 +81,6 @@
     <string name="push_title_hint">Title</string>
     <string name="push_content_hint">Content</string>
     <string name="push_priority_hint">Priority</string>
-    <string name="push_missing_app_info">There are no applications available on the server\nto push a message to.</string>
+    <string name="push_missing_app_info">There are no applications available on the server to push a message to.</string>
     <string name="message_copied_to_clipboard">Content copied to clipboard</string>
 </resources>

From 61c7b369687f2e9789c4e250e9ec006499f48a87 Mon Sep 17 00:00:00 2001
From: Markus <markus-schwarz@onlinehome.de>
Date: Mon, 26 Jul 2021 17:38:06 +0200
Subject: [PATCH 6/7] Prevent toggling state of button when apps available

Setting buttons default state back to enabled and
disable it when no apps available or request for apps failed.
Therefore added onUpdateFailed callback to ApplicationHolder.
---
 .../gotify/messages/provider/ApplicationHolder.java    | 10 +++++++++-
 .../java/com/github/gotify/sharing/ShareActivity.java  |  8 +++++++-
 app/src/main/res/layout/activity_share.xml             |  1 -
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/github/gotify/messages/provider/ApplicationHolder.java b/app/src/main/java/com/github/gotify/messages/provider/ApplicationHolder.java
index be85b2a0..38bdc352 100644
--- a/app/src/main/java/com/github/gotify/messages/provider/ApplicationHolder.java
+++ b/app/src/main/java/com/github/gotify/messages/provider/ApplicationHolder.java
@@ -13,6 +13,7 @@
 public class ApplicationHolder {
     private List<Application> state;
     private Runnable onUpdate;
+    private Runnable onUpdateFailed;
     private Activity activity;
     private ApiClient client;
 
@@ -35,11 +36,14 @@ public void request() {
 
     private void onReceiveApps(List<Application> apps) {
         state = apps;
-        onUpdate.run();
+        if (onUpdate != null)
+            onUpdate.run();
     }
 
     private void onFailedApps(ApiException e) {
         Utils.showSnackBar(activity, "Could not request applications, see logs.");
+        if (onUpdateFailed != null)
+            onUpdateFailed.run();
     }
 
     public List<Application> get() {
@@ -49,4 +53,8 @@ public List<Application> get() {
     public void onUpdate(Runnable runnable) {
         this.onUpdate = runnable;
     }
+
+    public void onUpdateFailed(Runnable runnable) {
+        this.onUpdateFailed = runnable;
+    }
 }
diff --git a/app/src/main/java/com/github/gotify/sharing/ShareActivity.java b/app/src/main/java/com/github/gotify/sharing/ShareActivity.java
index 6055c9b8..86ed2c87 100644
--- a/app/src/main/java/com/github/gotify/sharing/ShareActivity.java
+++ b/app/src/main/java/com/github/gotify/sharing/ShareActivity.java
@@ -85,10 +85,11 @@ protected void onCreate(Bundle savedInstanceState) {
             List<Application> apps = appsHolder.get();
             populateSpinner(apps);
 
-            boolean appsAvailable = apps.size() > 0;
+            boolean appsAvailable = !apps.isEmpty();
             pushMessageButton.setEnabled(appsAvailable);
             missingAppsInfo.setVisibility(appsAvailable ? View.GONE : View.VISIBLE);
         });
+        appsHolder.onUpdateFailed(() -> pushMessageButton.setEnabled(false));
         appsHolder.request();
     }
 
@@ -113,6 +114,11 @@ public void pushMessage(View view) {
         } else if (priority.isEmpty()) {
             Toast.makeText(this, "Priority should be number.", Toast.LENGTH_LONG).show();
             return;
+        } else if (appIndex == Spinner.INVALID_POSITION) {
+            //For safety, e.g. loading the apps needs too much time (maybe a timeout) and
+            //the user tries to push without an app selected.
+            Toast.makeText(this, "An app must be selected.", Toast.LENGTH_LONG).show();
+            return;
         }
 
         Message message = new Message();
diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml
index 333fd1ed..47086a5c 100644
--- a/app/src/main/res/layout/activity_share.xml
+++ b/app/src/main/res/layout/activity_share.xml
@@ -128,7 +128,6 @@
             android:layout_gravity="center_vertical|center_horizontal"
             android:layout_marginHorizontal="20dp"
             android:layout_marginBottom="20dp"
-            android:enabled="false"
             android:text="@string/push_button" />
 
     </LinearLayout>

From 010cbf2d68bd749675263946f72a1a4eae8ae04b Mon Sep 17 00:00:00 2001
From: Jannis Mattheis <contact@jmattheis.de>
Date: Tue, 27 Jul 2021 20:12:55 +0200
Subject: [PATCH 7/7] Format

---
 .../messages/provider/ApplicationHolder.java  |  6 ++----
 .../github/gotify/sharing/ShareActivity.java  | 21 ++++++++++---------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/github/gotify/messages/provider/ApplicationHolder.java b/app/src/main/java/com/github/gotify/messages/provider/ApplicationHolder.java
index 38bdc352..9c023620 100644
--- a/app/src/main/java/com/github/gotify/messages/provider/ApplicationHolder.java
+++ b/app/src/main/java/com/github/gotify/messages/provider/ApplicationHolder.java
@@ -36,14 +36,12 @@ public void request() {
 
     private void onReceiveApps(List<Application> apps) {
         state = apps;
-        if (onUpdate != null)
-            onUpdate.run();
+        if (onUpdate != null) onUpdate.run();
     }
 
     private void onFailedApps(ApiException e) {
         Utils.showSnackBar(activity, "Could not request applications, see logs.");
-        if (onUpdateFailed != null)
-            onUpdateFailed.run();
+        if (onUpdateFailed != null) onUpdateFailed.run();
     }
 
     public List<Application> get() {
diff --git a/app/src/main/java/com/github/gotify/sharing/ShareActivity.java b/app/src/main/java/com/github/gotify/sharing/ShareActivity.java
index 86ed2c87..dcd29940 100644
--- a/app/src/main/java/com/github/gotify/sharing/ShareActivity.java
+++ b/app/src/main/java/com/github/gotify/sharing/ShareActivity.java
@@ -81,14 +81,15 @@ protected void onCreate(Bundle savedInstanceState) {
         ApiClient client =
                 ClientFactory.clientToken(settings.url(), settings.sslSettings(), settings.token());
         appsHolder = new ApplicationHolder(this, client);
-        appsHolder.onUpdate(() -> {
-            List<Application> apps = appsHolder.get();
-            populateSpinner(apps);
-
-            boolean appsAvailable = !apps.isEmpty();
-            pushMessageButton.setEnabled(appsAvailable);
-            missingAppsInfo.setVisibility(appsAvailable ? View.GONE : View.VISIBLE);
-        });
+        appsHolder.onUpdate(
+                () -> {
+                    List<Application> apps = appsHolder.get();
+                    populateSpinner(apps);
+
+                    boolean appsAvailable = !apps.isEmpty();
+                    pushMessageButton.setEnabled(appsAvailable);
+                    missingAppsInfo.setVisibility(appsAvailable ? View.GONE : View.VISIBLE);
+                });
         appsHolder.onUpdateFailed(() -> pushMessageButton.setEnabled(false));
         appsHolder.request();
     }
@@ -115,8 +116,8 @@ public void pushMessage(View view) {
             Toast.makeText(this, "Priority should be number.", Toast.LENGTH_LONG).show();
             return;
         } else if (appIndex == Spinner.INVALID_POSITION) {
-            //For safety, e.g. loading the apps needs too much time (maybe a timeout) and
-            //the user tries to push without an app selected.
+            // For safety, e.g. loading the apps needs too much time (maybe a timeout) and
+            // the user tries to push without an app selected.
             Toast.makeText(this, "An app must be selected.", Toast.LENGTH_LONG).show();
             return;
         }