From c1c2c415dd5685290c11287a674026e2e741c6a8 Mon Sep 17 00:00:00 2001 From: Eric House Date: Wed, 20 Mar 2019 16:50:44 -0700 Subject: [PATCH] changelog and cleanup --- .../android/app/src/main/assets/changes.html | 32 ++++++------------- .../eehouse/android/xw4/BoardDelegate.java | 2 +- .../org/eehouse/android/xw4/GameLock.java | 2 -- .../org/eehouse/android/xw4/GameUtils.java | 4 --- .../java/org/eehouse/android/xw4/XWApp.java | 3 -- .../eehouse/android/xw4/jni/JNIThread.java | 1 - .../eehouse/android/xw4/jni/LocalPlayer.java | 1 - .../org/eehouse/android/xw4/jni/XwJNI.java | 3 -- 8 files changed, 10 insertions(+), 38 deletions(-) diff --git a/xwords4/android/app/src/main/assets/changes.html b/xwords4/android/app/src/main/assets/changes.html index 33f3ae25e..bc042251d 100644 --- a/xwords4/android/app/src/main/assets/changes.html +++ b/xwords4/android/app/src/main/assets/changes.html @@ -15,8 +15,8 @@

CrossWords 4.4.143 release

-

This is a fdroid-only release fixing a problem that made the - previous release, whose changelist is below, unbuildable for fdroid

+

This release fixes a relay communication problem for all versions + and a build problem for the F-Droid version

Please take @@ -26,26 +26,11 @@

New with this release

    -
  • Lots of internal changes to background networking (for games - using the relay, Bluetooth or Data SMS) to comply with - recent requirements from Google. (I hope you won't notice - :-)
    • -
  • Improve Invite-via-Bluetooth dialog, esp. show when a remote - device was last detected via scan
    • -
  • Disable Play-by-Data-SMS feature (Google Play version only)
    • -
  • Store new games outside Archive group even if created from - inside it
    • -
  • Replace "Google Cloud Messaging" with the newer Firebase - workalike. (You should not notice, at least in the Google - Play Store version.)
    • -
  • For Spanish games only, allow trades when fewer than 7 tiles - remain
    • -
  • New translations in Arabic, German, Japanese, Norwegian, - Polish and Portuguese
    • -
  • Use https instead of http for web communication - (e.g. wordlist downloads)
    • -
  • Disable logging for release builds (to improve performance)
    • -
  • Fix some infrequent crashes
    • +
  • Stop replacing your name with "Player 2"
    • +
  • Fix long-standing bug in Relay networking
    • +
  • Fix F-Droid build
    • +
  • Improve interaction with NBSProxy (impacts those using + play-by-Data-SMS)

(The full changelog @@ -54,7 +39,8 @@

Next up

Please let me know diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java index e447109c4..da004f10a 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java @@ -1358,7 +1358,7 @@ public class BoardDelegate extends DelegateBase break; case MESSAGE_NOGAME: final int gameID = (Integer)args[0]; - if ( null != m_gi && gameID == m_gi.gameID && !isFinishing() ) { // NPE + if ( null != m_gi && gameID == m_gi.gameID && !isFinishing() ) { post( new Runnable() { @Override public void run() { diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java index 451696647..f6e1d09c8 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java @@ -319,7 +319,6 @@ public class GameLock implements AutoCloseable, Serializable { public void release() { int count = m_lockCount.decrementAndGet(); - Log.d( TAG, "%s.release(): count NOW %d", this, count ); if ( count == 0 ) { getFor( m_rowid ).unlock(); } @@ -328,7 +327,6 @@ public class GameLock implements AutoCloseable, Serializable { public GameLock retain() { int count = m_lockCount.incrementAndGet(); - Log.d( TAG, "%s.retain(): count NOW %d", this, count ); return this; } diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java index a85172d3b..f3a0b5062 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java @@ -201,7 +201,6 @@ public class GameUtils { private static GameSummary summarize( Context context, GameLock lock, GamePtr gamePtr, CurGameInfo gi ) { - Log.d( TAG, "summarize(gi=%s)", gi ); GameSummary summary = new GameSummary( gi ); XwJNI.game_summarize( gamePtr, summary ); @@ -523,7 +522,6 @@ public class GameUtils { CurGameInfo gi, GameLock lock, boolean setCreate ) { - Log.d( TAG, "saveGame() gi: %s", gi ); byte[] stream = XwJNI.game_saveToStream( gamePtr, gi ); return saveGame( context, stream, lock, setCreate ); } @@ -531,7 +529,6 @@ public class GameUtils { public static long saveNewGame( Context context, GamePtr gamePtr, CurGameInfo gi, long groupID ) { - Log.d( TAG, "saveNewGame() gi: %s", gi ); byte[] stream = XwJNI.game_saveToStream( gamePtr, gi ); long rowid; try ( GameLock lock = DBUtils.saveNewGame( context, stream, groupID, null ) ) { @@ -1047,7 +1044,6 @@ public class GameUtils { DBUtils.setMsgFlags( rowid, flags | curFlags ); } } - Log.d( TAG, "feedMessage(): gi: %s)", gi ); } } catch ( GameLock.GameLockedException gle ) { DbgUtils.toastNoLock( TAG, context, rowid, diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java index d37422bbd..28673f063 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java @@ -72,9 +72,6 @@ public class XWApp extends Application Assert.assertTrue( s_context == s_context.getApplicationContext() ); super.onCreate(); - // Remove me soon!!! - Assert.assertTrue( BuildConfig.DEBUG == getResources().getBoolean(R.bool.DEBUG) ); - ProcessLifecycleOwner.get().getLifecycle().addObserver(this); android.util.Log.i( TAG, "onCreate(); git_rev=" diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java index f312537d6..5a7c8f803 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java @@ -388,7 +388,6 @@ public class JNIThread extends Thread implements AutoCloseable { if ( null != m_newDict ) { m_gi.dictName = m_newDict; } - Log.d( TAG, "save_jni(); m_gi: %s", m_gi ); byte[] state = XwJNI.game_saveToStream( m_jniGamePtr, m_gi ); int newHash = Arrays.hashCode( state ); boolean hashesEqual = m_lastSavedState == newHash; diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/LocalPlayer.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/LocalPlayer.java index 44cb22b1e..d221e724c 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/LocalPlayer.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/LocalPlayer.java @@ -44,7 +44,6 @@ public class LocalPlayer implements Serializable { isLocal = true; robotIQ = 0; // human name = CommonPrefs.getDefaultPlayerName( context, num, true ); - Log.d( TAG, "__init(%d) => %s", num, name ); password = ""; // Utils.testSerialization( this ); diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java index 72db04333..1d58afea5 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java @@ -163,7 +163,6 @@ public class XwJNI { public static void gi_from_stream( CurGameInfo gi, byte[] stream ) { gi_from_stream( getJNI().m_ptr, gi, stream ); - Log.d( TAG, "gi_from_stream() read: %s", gi ); } public static byte[] nliToStream( NetLaunchInfo nli ) @@ -208,8 +207,6 @@ public class XwJNI { cp, procs ) ) { gamePtr.release(); gamePtr = null; - } else { - Log.d( TAG, "initFromStream() read: %s", gi ); } return gamePtr;