[Jrisk-cvs] SF.net SVN: domination-code:[2583] Domination

[<yu...@us...>]

Revision: 2583
          http://sourceforge.net/p/domination/code/2583
Author:   yuranet
Date:     2024-11-23 20:53:57 +0000 (Sat, 23 Nov 2024)
Log Message:
-----------
fix for notifications

Modified Paths:
--------------
    Domination/ChangeLog.txt
    Domination/android/AndroidManifest.xml
    Domination/sharedUI/src_mapstore_lobby/net/yura/lobby/mini/MiniLobbyClient.java

Modified: Domination/ChangeLog.txt
===================================================================
--- Domination/ChangeLog.txt	2024-11-21 18:52:07 UTC (rev 2582)
+++ Domination/ChangeLog.txt	2024-11-23 20:53:57 UTC (rev 2583)
@@ -7,7 +7,7 @@
 	 * Save:	8
 
 	iOS:		16
-	Android:	95
+	Android:	96
 	Game GUI:	2
 	Swing GUI:	2
 	Simple GUI:	2
@@ -37,6 +37,10 @@
 	Android 95 Sound
 		   Fix bug with maps not loading from external storage
 
+	Android 96 fix for notifications not working
+		   Show corrupted maps in MapChooser so they can be deleted
+		   maybe fixed issue with opening urls in browser
+
 1.2.9 (04.08.2023) (svn rev 2470)
 
 	Hi-resolution support for image assets in main game UI

Modified: Domination/android/AndroidManifest.xml
===================================================================
--- Domination/android/AndroidManifest.xml	2024-11-21 18:52:07 UTC (rev 2582)
+++ Domination/android/AndroidManifest.xml	2024-11-23 20:53:57 UTC (rev 2583)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
       package="net.yura.domination"
-      android:versionCode="95"
-      android:versionName="95"
+      android:versionCode="96"
+      android:versionName="96"
       android:installLocation="auto">
 
     <!-- android:targetSdkVersion 11 to hide the legacy menu button on tablets -->
@@ -36,8 +36,8 @@
     <uses-permission android:name="net.yura.domination.permission.C2D_MESSAGE"/>
     <!-- Keeps the processor from sleeping when a message is received. -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
-
     <!-- this means i dont need different assets for different resolutions -->
     <!-- supports-screens android:anyDensity="false"/ -->
     <!-- THIS DOES NOT WORK IF hardwareAccelerated=true!!!! -->

Modified: Domination/sharedUI/src_mapstore_lobby/net/yura/lobby/mini/MiniLobbyClient.java
===================================================================
--- Domination/sharedUI/src_mapstore_lobby/net/yura/lobby/mini/MiniLobbyClient.java	2024-11-21 18:52:07 UTC (rev 2582)
+++ Domination/sharedUI/src_mapstore_lobby/net/yura/lobby/mini/MiniLobbyClient.java	2024-11-23 20:53:57 UTC (rev 2583)
@@ -509,6 +509,7 @@
             String iosNotificationSetting = System.getProperty("iosNotificationSetting");
 
             // the OS will only ever show this once, so we must make sure we only ever request it once
+            // can be "on", "off" or "ask"
             if ("ask".equals(iosNotificationSetting)) {
                 OptionPane.showMessageDialog(new ActionListener() {
                     @java.lang.Override
@@ -519,6 +520,8 @@
             }
         }
         else if (Application.getPlatform() == Application.PLATFORM_ANDROID) {
+            // TODO android also has a 'notificationSetting' value, but its a bit more retarded, as when its off, you still need to request it
+
             // creates Notification Channel
             // on new version of android this prompts the user to allow notifications.
             // On android this method can be called many times and it just updates the channel settings