Merge branch 'develop'

viktorholk · Mar 10, 2024 · 903001f · 903001f
2 parents 363ea2b + fe16b6b
commit 903001f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     package="com.viktorholk.apipushnotifications">
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <application

diff --git a/api/app.py b/api/app.py
@@ -4,9 +4,6 @@
 from flask import Flask, jsonify, request
 
 app = Flask(__name__)
-# I just prefer that the data attribute comes after the status and message in the response 	⊂(◉‿◉)つ
-app.json.sort_keys = False
-
 
 # Setup the config and make sure the file is present
 CONFIG_FILE = 'config.ini'