[Jrisk-cvs] SF.net SVN: domination-code:[2581] Domination
Brought to you by:
yuranet
Menu
▾
▴
[Jrisk-cvs] SF.net SVN: domination-code:[2581] Domination
|
From: <yu...@us...> - 2024-11-21 15:41:17
|
Revision: 2581
http://sourceforge.net/p/domination/code/2581
Author: yuranet
Date: 2024-11-21 15:41:15 +0000 (Thu, 21 Nov 2024)
Log Message:
-----------
disable logging some errors
Modified Paths:
--------------
Domination/android/google-services.json
Domination/android/res/values/ids.xml
Domination/android/src/net/yura/domination/android/push/FCMServerUtilities.java
Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapServerClient.java
Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java
Modified: Domination/android/google-services.json
===================================================================
--- Domination/android/google-services.json 2024-11-10 17:45:51 UTC (rev 2580)
+++ Domination/android/google-services.json 2024-11-21 15:41:15 UTC (rev 2581)
@@ -3,7 +3,7 @@
"project_number": "783159960229",
"firebase_url": "https://api-project-783159960229.firebaseio.com",
"project_id": "api-project-783159960229",
- "storage_bucket": "api-project-783159960229.appspot.com"
+ "storage_bucket": "api-project-783159960229.firebasestorage.app"
},
"client": [
{
@@ -15,6 +15,22 @@
},
"oauth_client": [
{
+ "client_id": "783159960229-kpsb2fulqdi64012rjot6a2r9vqrd51a.apps.googleusercontent.com",
+ "client_type": 1,
+ "android_info": {
+ "package_name": "net.yura.domination",
+ "certificate_hash": "c91ea12a88071323c2143e5634fe3541d86e05cd"
+ }
+ },
+ {
+ "client_id": "783159960229.apps.googleusercontent.com",
+ "client_type": 1,
+ "android_info": {
+ "package_name": "net.yura.domination",
+ "certificate_hash": "33800819f1ecadd8b014bb73f95e9061a66ebf50"
+ }
+ },
+ {
"client_id": "783159960229-0542gq1ggufjp8abmu8eo8qfg8n9nmbv.apps.googleusercontent.com",
"client_type": 3
}
@@ -30,6 +46,13 @@
{
"client_id": "783159960229-0542gq1ggufjp8abmu8eo8qfg8n9nmbv.apps.googleusercontent.com",
"client_type": 3
+ },
+ {
+ "client_id": "783159960229-lkr32qlp1ig7sm9o97i9htpjjnf6sqqu.apps.googleusercontent.com",
+ "client_type": 2,
+ "ios_info": {
+ "bundle_id": "net.yura.domination"
+ }
}
]
}
@@ -37,4 +60,4 @@
}
],
"configuration_version": "1"
-}
+}
\ No newline at end of file
Modified: Domination/android/res/values/ids.xml
===================================================================
--- Domination/android/res/values/ids.xml 2024-11-10 17:45:51 UTC (rev 2580)
+++ Domination/android/res/values/ids.xml 2024-11-21 15:41:15 UTC (rev 2581)
@@ -3,7 +3,8 @@
<string name="app_id" translatable="false">783159960229</string>
<string name="server_client_id" translatable="false">783159960229-3ssrlemm017ak0qrlpv83rvjjud1mn2b.apps.googleusercontent.com</string>
- <!-- FCM stuff from build/generated/res/google-services/debug/values/values.xml -->
+ <!-- FCM stuff from build/generated/res/google-services/debug/values/values.xml
+ to regenerate this file, apply plugin: 'com.google.gms.google-services' in build.gradle -->
<string name="default_web_client_id" translatable="false">783159960229-0542gq1ggufjp8abmu8eo8qfg8n9nmbv.apps.googleusercontent.com</string>
<string name="firebase_database_url" translatable="false">https://api-project-783159960229.firebaseio.com</string>
<string name="gcm_defaultSenderId" translatable="false">783159960229</string>
@@ -10,6 +11,6 @@
<string name="google_api_key" translatable="false">AIzaSyBbgBRioDmGzC1f7V9TSRDg28YBsXp6yjY</string>
<string name="google_app_id" translatable="false">1:783159960229:android:25ae2b83efd7acc5c2234c</string>
<string name="google_crash_reporting_api_key" translatable="false">AIzaSyBbgBRioDmGzC1f7V9TSRDg28YBsXp6yjY</string>
- <string name="google_storage_bucket" translatable="false">api-project-783159960229.appspot.com</string>
+ <string name="google_storage_bucket" translatable="false">api-project-783159960229.firebasestorage.app</string>
<string name="project_id" translatable="false">api-project-783159960229</string>
</resources>
Modified: Domination/android/src/net/yura/domination/android/push/FCMServerUtilities.java
===================================================================
--- Domination/android/src/net/yura/domination/android/push/FCMServerUtilities.java 2024-11-10 17:45:51 UTC (rev 2580)
+++ Domination/android/src/net/yura/domination/android/push/FCMServerUtilities.java 2024-11-21 15:41:15 UTC (rev 2581)
@@ -45,6 +45,9 @@
// TODO maybe prompt user to check phone date/time
// TODO also some report that retrying can fix this issue
"SERVICE_NOT_AVAILABLE".equals(exception.getMessage())
+
+ // not sure why this sometimes happens
+ //"FIS_AUTH_ERROR".equals(exception.getMessage())
)) {
level = Level.INFO;
}
Modified: Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapServerClient.java
===================================================================
--- Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapServerClient.java 2024-11-10 17:45:51 UTC (rev 2580)
+++ Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapServerClient.java 2024-11-21 15:41:15 UTC (rev 2581)
@@ -106,6 +106,7 @@
// "java.io.IOException: unexpected end of stream on com.android.okhttp.Address@b7996b41" "Caused by: java.io.EOFException: \n not found: size=0 content=..."
(ex instanceof IOException && responseCode == 0 && ex.getCause() instanceof EOFException) || // end of stream during getResponseCode
(ex instanceof ProtocolException && "unexpected end of stream".equals(ex.getMessage())) ||
+ (ex instanceof ProtocolException && ex.getMessage() != null && ex.getMessage().startsWith("Unexpected status line:")) ||
(ex instanceof SocketException &&
("Connection timed out".equals(ex.getMessage()) ||
"Connection reset by peer".equals(ex.getMessage()) ||
Modified: Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java
===================================================================
--- Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java 2024-11-10 17:45:51 UTC (rev 2580)
+++ Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java 2024-11-21 15:41:15 UTC (rev 2581)
@@ -140,6 +140,10 @@
if (RiskUtil.isOldVersion()) {
return true;
}
+ // if we have already quit the game, any events arriving after may cause errors
+ if (net.yura.mobile.gui.DesktopPane.getDesktopPane() == null) {
+ return true;
+ }
String loggerName = record.getLoggerName();
if ("DataScheduler".equals(loggerName)) { // "libcore.io.IoBridge".equals(className) && "isDataSchedulerEnabled".equals(methodName)
// isDataSchedulerEnabled(): DataScheduler is disabled, exeption=java.io.FileNotFoundException: /system/etc/datascheduling_policy_conf.xml: open failed: ENOENT (No such file or directory)
@@ -191,6 +195,14 @@
// java.lang.IllegalArgumentException: Service not registered: com.amazon.webview.awvdeploymentservice.client.AWVDeploymentClient$1@7992672
return true;
}
+ if ("android.app.Dialog".equals(className) && "show".equals(methodName)) {
+ // ERR: java.lang.SecurityException: net.yura.domination was not granted this permission: android.permission.WRITE_SETTINGS.
+ return true;
+ }
+ if ("android.app.Dialog".equals(className) && "dismissDialog".equals(methodName)) {
+ // ERR: java.lang.SecurityException: net.yura.domination was not granted this permission: android.permission.WRITE_SETTINGS.
+ return true;
+ }
}
String message = record.getMessage();
|
