added disable warning

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

@@ -98,3 +98,5 @@ public class SCNApp extends Application implements LifecycleObserver
         isBackground = false;
     }
 }
+
+//TODO TabLayout indicator does not corretly animate when directly clicking on tabs

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

@@ -346,7 +346,7 @@ public class ServerCommunication
                         JSONArray arr = json.getJSONArray("data");
                         for (int i = 0; i < count; i++)
                         {
-                            JSONObject o = arr.getJSONObject(0);
+                            JSONObject o = arr.getJSONObject(i);
 
                             long time         = json_lng(o, "timestamp");
                             String title      = json_str(o, "title");

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

@@ -174,8 +174,7 @@ public class NotificationService
         mBuilder.setWhen(msg.Timestamp * 1000);
         mBuilder.setAutoCancel(true);
         mBuilder.setCategory(Notification.CATEGORY_MESSAGE);
-        mBuilder.setStyle(new NotificationCompat.InboxStyle());
+        mBuilder.setGroup("com.blackforestbytes.simplecloudnotifier.notifications.group."+prio.toString());
-        mBuilder.setGroup(prio.toString());
 
         if (msg.Priority == PriorityEnum.LOW)    mBuilder.setPriority(NotificationCompat.PRIORITY_LOW);
         if (msg.Priority == PriorityEnum.NORMAL) mBuilder.setPriority(NotificationCompat.PRIORITY_DEFAULT);
@@ -218,8 +217,7 @@ public class NotificationService
         mBuilder.setWhen(msg.Timestamp * 1000);
         mBuilder.setAutoCancel(true);
         mBuilder.setCategory(Notification.CATEGORY_MESSAGE);
-        mBuilder.setStyle(new NotificationCompat.InboxStyle());
+        mBuilder.setGroup("com.blackforestbytes.simplecloudnotifier.notifications.group."+prio.toString());
-        mBuilder.setGroup(prio.toString());
 
         if (ns.EnableLED) mBuilder.setLights(ns.LEDColor, 500, 500);
 
@@ -251,7 +249,7 @@ public class NotificationService
         Notification n = mBuilder.build();
         n.flags |= Notification.FLAG_AUTO_CANCEL;
 
-        mNotificationManager.notify(0, n);
+        mNotificationManager.notify((int)msg.SCN_ID, n);
 
         if (ns.EnableVibration)
         {

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

@@ -6,12 +6,14 @@ import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.blackforestbytes.simplecloudnotifier.R;
@@ -91,7 +93,7 @@ public class AccountFragment extends Fragment
 
             builder.setPositiveButton("YES", (dialog, which) -> {
                 CMessageList.inst().clear();
-                SCNApp.showToast("Notifications cleared", 1000);
+                SCNApp.showToast("Messages cleared", 1000);
                 dialog.dismiss();
             });
 
@@ -126,10 +128,11 @@ public class AccountFragment extends Fragment
     public void updateUI(View v)
     {
         if (v == null) return;
-        TextView tvUserID  = v.findViewById(R.id.tvUserID);
+        TextView    tvUserID  = v.findViewById(R.id.tvUserID);
-        TextView tvUserKey = v.findViewById(R.id.tvUserKey);
+        TextView    tvUserKey = v.findViewById(R.id.tvUserKey);
-        TextView tvQuota   = v.findViewById(R.id.tvQuota);
+        TextView    tvQuota   = v.findViewById(R.id.tvQuota);
-        ImageButton btnQR  = v.findViewById(R.id.btnQR);
+        ImageView   ivQuota   = v.findViewById(R.id.ic_img_quota);
+        ImageButton btnQR     = v.findViewById(R.id.btnQR);
 
         SCNSettings s = SCNSettings.inst();
 
@@ -139,6 +142,7 @@ public class AccountFragment extends Fragment
             tvUserKey.setText(s.user_key);
             tvQuota.setText(String.format("%d / %d", s.quota_curr, s.quota_max));
             btnQR.setImageBitmap(QRCode.from(s.createOnlineURL()).to(ImageType.PNG).withSize(512, 512).bitmap());
+            ivQuota.setColorFilter(s.quota_curr>=s.quota_max ? Color.rgb(200, 0, 0) : Color.rgb(128, 128, 128));
         }
         else
         {
@@ -146,6 +150,7 @@ public class AccountFragment extends Fragment
             tvUserKey.setText(R.string.str_not_connected);
             tvQuota.setText(R.string.str_not_connected);
             btnQR.setImageResource(R.drawable.qr_default);
+            ivQuota.setColorFilter(0x80_80_80);
         }
     }
 }

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

@@ -22,6 +22,7 @@ import android.widget.SeekBar;
 import android.widget.Spinner;
 import android.widget.Switch;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.android.billingclient.api.Purchase;
 import com.blackforestbytes.simplecloudnotifier.R;
@@ -216,7 +217,7 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
     {
         SCNSettings s = SCNSettings.inst();
 
-        prefAppEnabled.setOnCheckedChangeListener((a,b) -> { s.Enabled=b; saveAndUpdate(); });
+        prefAppEnabled.setOnCheckedChangeListener((a,b) -> { boolean prev=s.Enabled; s.Enabled=b; saveAndUpdate(); updateEnabled(prev, b); });
         prefEnableDeleteSwipe.setOnCheckedChangeListener((a,b) -> { s.EnableDeleteSwipe=b; saveAndUpdate(); });
 
         prefLocalCacheSize.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener()
@@ -261,6 +262,18 @@ 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 updateEnabled(boolean prev, boolean now)
+    {
+        if (!prev && now)
+        {
+            SCNApp.showToast("SimpleCloudNotifier is now enabled", Toast.LENGTH_SHORT);
+        }
+        else if (prev && !now)
+        {
+            SCNApp.showToast("SimpleCloudNotifier is now disabled\nYou won't recieve new messages.", Toast.LENGTH_LONG);
+        }
+    }
+
     private void updateVolume(int idx, int volume)
     {
         if (mPlayers[idx] != null && mPlayers[idx].isPlaying())

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

@@ -35,7 +35,7 @@ public class TabAdapter extends FragmentStatePagerAdapter {
     {
         switch (position)
         {
-            case 0:  return "Notifications";
+            case 0:  return "Messages";
             case 1:  return "Account";
             case 2:  return "Settings";
             default: return null;

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

@@ -11,13 +11,13 @@
     <string name="ic_img_fuel_desc">Icon Fuel</string>
     <string name="str_qr_code">QR Code</string>
     <string name="str_reset_account">Reset Account</string>
-    <string name="no_notifications">No notifications</string>
+    <string name="no_notifications">No messages</string>
     <string name="str_not_connected">not connected</string>
     <string name="str_reload">reload</string>
     <string name="desc_priority_icon">Priority icon</string>
     <string name="str_common_settings">Common Settings</string>
     <string name="str_enabled">Enabled</string>
-    <string name="str_localcachesize">Remember the last x notifications locally</string>
+    <string name="str_localcachesize">Remember the last x messages locally</string>
     <string name="str_header_prio0">Notifications (priority 0 - Low)</string>
     <string name="str_header_prio1">Notifications (priority 1 - Normal)</string>
     <string name="str_header_prio2">Notifications (priority 2 - High)</string>

android/app/version.properties

@@ -1,3 +1,3 @@
-#Sat Nov 17 17:19:33 CET 2018
+#Sat Nov 17 18:59:44 CET 2018
-VERSION_NAME=0.0.10
+VERSION_NAME=0.0.11
-VERSION_CODE=10
+VERSION_CODE=11

web/api/__config_example.php

@@ -0,0 +1,56 @@
+<?php
+
+// insert your values here and rename to config.php
+
+return
+[
+	'global' =>
+	[
+		'prod' => true,
+	],
+
+	'database' =>
+	[
+		'host'     => '?',
+		'database' => '?',
+		'user'     => '?',
+		'password' => '?',
+	],
+
+	'firebase' =>
+	[
+		'type'                        => 'service_account',
+		'project_id'                  => '?',
+		'private_key_id'              => '???',
+		'client_email'                => '???.iam.gserviceaccount.com',
+		'client_id'                   => '???',
+		'auth_uri'                    => 'https://accounts.google.com/o/oauth2/auth',
+		'token_uri'                   => 'https://oauth2.googleapis.com/token',
+		'auth_provider_x509_cert_url' => 'https://www.googleapis.com/oauth2/v1/certs',
+		'client_x509_cert_url'        => 'https://www.googleapis.com/robot/v1/metadata/x509/???f.iam.gserviceaccount.com',
+		'private_key'                 => "-----BEGIN PRIVATE KEY-----\n"
+		                               . "??????????\n"
+		                               . "-----END PRIVATE KEY-----\n",
+		'server_key'                  => '????',
+	],
+
+	'verify_api' =>
+	[
+		'package_name'   => 'com.blackforestbytes.simplecloudnotifier',
+		'product_id'     => '???',
+
+		'clientid'       => '???.apps.googleusercontent.com',
+		'clientsecret'   => '???',
+		'accesstoken'    => file_exists('.verify_accesstoken') ? file_get_contents('.verify_accesstoken') : '',
+		'refreshtoken'   => '???',
+		'scope'          => 'https://www.googleapis.com/auth/androidpublisher',
+	],
+
+	'error_reporting' =>
+	[
+		'send-mail' => true,
+		'email-error-target' => '???@???.com',
+		'email-error-sender' => '???@???.com',
+	],
+
+];

web/js/logic.js

@@ -34,10 +34,10 @@ function send()
 		if (xhr.readyState !== 4) return;
 
 		console.log('Status: ' + xhr.status);
-		if (xhr.status === 200)
+		if (xhr.status === 200 || xhr.status === 401 || xhr.status === 403 || xhr.status === 412)
 		{
 			let resp = JSON.parse(xhr.responseText);
-			if (!resp.success)
+			if (!resp.success || xhr.status !== 200)
 			{
 				if (resp.errhighlight === 101) uid.classList.add('input-invalid');
 				if (resp.errhighlight === 102) key.classList.add('input-invalid');

web/send.php

@@ -42,7 +42,7 @@ try
 	$stmt->execute(['uid' => $user_id]);
 
 	$datas = $stmt->fetchAll(PDO::FETCH_ASSOC);
-	if (count($datas)<=0) die(json_encode(['success' => false, 'error' => ERR::USER_NOT_FOUND, 'errhighlight' => 101, 'message' => 'User not found']));
+	if (count($datas)<=0) api_return(401, ['success' => false, 'error' => ERR::USER_NOT_FOUND, 'errhighlight' => 101, 'message' => 'User not found']);
 	$data = $datas[0];
 
 	if ($data === null)                     api_return(401, ['success' => false, 'error' => ERR::USER_NOT_FOUND,   'errhighlight' => 101, 'message' => 'User not found']);