From f97623b4895624790553bc4b6877af1d58c23301 Mon Sep 17 00:00:00 2001 From: Eric House Date: Tue, 10 May 2022 18:58:28 -0700 Subject: [PATCH] more cleanup: remove obits and relay sync menuitem --- .../eehouse/android/xw4/BoardDelegate.java | 11 -- .../org/eehouse/android/xw4/DBHelper.java | 10 +- .../java/org/eehouse/android/xw4/DBUtils.java | 138 +----------------- .../org/eehouse/android/xw4/DelegateBase.java | 5 - .../org/eehouse/android/xw4/DlgDelegate.java | 14 -- .../org/eehouse/android/xw4/GameUtils.java | 13 +- .../android/xw4/GamesListDelegate.java | 16 -- .../android/xw4/MQTTCheckBoxPreference.java | 2 +- .../org/eehouse/android/xw4/NetUtils.java | 67 +-------- .../main/res/drawable/stat_notify_sync.png | Bin 4268 -> 0 bytes .../src/main/res/menu-small/board_menu.xml | 4 - .../app/src/main/res/menu/board_menu.xml | 4 - .../app/src/main/res/menu/games_list_menu.xml | 5 - .../app/src/main/res/values/common_rsrc.xml | 1 - .../app/src/main/res/values/strings.xml | 9 -- 15 files changed, 11 insertions(+), 288 deletions(-) delete mode 100644 xwords4/android/app/src/main/res/drawable/stat_notify_sync.png 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 619583b8d..f602c753f 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 @@ -844,7 +844,6 @@ public class BoardDelegate extends DelegateBase boolean netGame = null != m_gi && DeviceRole.SERVER_STANDALONE != m_gi.serverRole; - Utils.setItemVisible( menu, R.id.gamel_menu_checkmoves, netGame ); enable = netGame && null != m_gsi && 0 < m_gsi.nPendingMessages; Utils.setItemVisible( menu, R.id.board_menu_game_resend, enable ); @@ -974,13 +973,6 @@ public class BoardDelegate extends DelegateBase handleViaThread( JNICmd.CMD_RESEND, true, false, true ); break; - case R.id.gamel_menu_checkmoves: - makeNotAgainBuilder( R.string.not_again_sync, - R.string.key_notagain_sync, - Action.SYNC_ACTION ) - .show(); - break; - case R.id.board_menu_file_prefs: m_firingPrefs = true; PrefsDelegate.launch( m_activity ); @@ -1014,9 +1006,6 @@ public class BoardDelegate extends DelegateBase case UNDO_LAST_ACTION: cmd = JNICmd.CMD_UNDO_LAST; break; - case SYNC_ACTION: - doSyncMenuitem(); - break; case SMS_CONFIG_ACTION: PrefsDelegate.launch( m_activity ); break; diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBHelper.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBHelper.java index d45905bb4..45dd30cb5 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBHelper.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBHelper.java @@ -37,7 +37,7 @@ public class DBHelper extends SQLiteOpenHelper { public enum TABLE_NAMES { SUM( "summaries", 0 ), - OBITS( "obits", 5 ), + _OBITS( "obits", 5 ), DICTBROWSE( "dictbrowse", 12 ), DICTINFO( "dictinfo", 12 ), GROUPS( "groups", 14 ), @@ -174,11 +174,6 @@ public class DBHelper extends SQLiteOpenHelper { ,{ THUMBNAIL, "BLOB" } }; - private static final String[][] s_obitsColsAndTypes = { - { RELAYID, "TEXT" } - ,{ SEED, "INTEGER" } - }; - private static final String[][] s_dictInfoColsAndTypes = { { DICTNAME, "TEXT" }, { LOC, "UNSIGNED INTEGER(1)" }, @@ -259,7 +254,6 @@ public class DBHelper extends SQLiteOpenHelper { public void onCreate( SQLiteDatabase db ) { createTable( db, TABLE_NAMES.SUM, s_summaryColsAndTypes ); - createTable( db, TABLE_NAMES.OBITS, s_obitsColsAndTypes ); createTable( db, TABLE_NAMES.DICTINFO, s_dictInfoColsAndTypes ); createTable( db, TABLE_NAMES.DICTBROWSE, s_dictBrowseColsAndTypes ); forceRowidHigh( db, TABLE_NAMES.SUM ); @@ -282,8 +276,6 @@ public class DBHelper extends SQLiteOpenHelper { boolean madeChatTable = false; boolean madeDITable = false; switch( oldVersion ) { - case 5: - createTable( db, TABLE_NAMES.OBITS, s_obitsColsAndTypes ); case 6: addSumColumn( db, TURN ); addSumColumn( db, GIFLAGS ); diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java index 337209251..fe2cca3e0 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java @@ -105,14 +105,6 @@ public class DBUtils { private static SQLiteOpenHelper s_dbHelper = null; private static SQLiteDatabase s_db = null; - public static class Obit { - public Obit( String relayID, int seed ) { - m_relayID = relayID; m_seed = seed; - } - String m_relayID; - int m_seed; - } - public static class HistoryPair { private HistoryPair( String p_msg, int p_playerIndx, int p_ts ) { @@ -236,6 +228,7 @@ public class DBUtils { CommsConnType typ = iter.next(); switch ( typ ) { case COMMS_CONN_RELAY: + Assert.failDbg(); col = cursor.getColumnIndex( DBHelper.ROOMNAME ); if ( col >= 0 ) { summary.roomName = cursor.getString( col ); @@ -335,6 +328,7 @@ public class DBUtils { iter.hasNext(); ) { switch ( iter.next() ) { case COMMS_CONN_RELAY: + Assert.failDbg(); values.put( DBHelper.ROOMNAME, summary.roomName ); String relayID = summary.relayID; values.put( DBHelper.RELAYID, relayID ); @@ -479,13 +473,6 @@ public class DBUtils { return result; } - public static int countOpenGamesUsingRelay( Context context ) - { - int result = countOpenGamesUsing( context, CommsConnType.COMMS_CONN_RELAY, - CommsConnType.COMMS_CONN_MQTT ); - return result; - } - public static int countOpenGamesUsingNBS( Context context ) { int result = countOpenGamesUsing( context, CommsConnType.COMMS_CONN_SMS ); @@ -616,6 +603,7 @@ public class DBUtils { devName, timestamp ); break; case RELAY: + Assert.failDbg(); msg = LocUtils.getString( context, R.string.invit_expl_relay_fmt, timestamp ); break; @@ -803,23 +791,6 @@ public class DBUtils { } } - public static String getRelayID( Context context, long rowid ) - { - String result = null; - String[] columns = { DBHelper.RELAYID }; - String selection = String.format( ROW_ID_FMT, rowid ); - initDB( context ); - synchronized( s_dbHelper ) { - Cursor cursor = query( TABLE_NAMES.SUM, columns, selection ); - if ( 1 == cursor.getCount() && cursor.moveToFirst() ) { - result = - cursor.getString( cursor.getColumnIndex(DBHelper.RELAYID) ); - } - cursor.close(); - } - return result; - } - public static HashMap getGamesWithSendsPending( Context context ) { @@ -978,109 +949,6 @@ public class DBUtils { } } - public static String[] getRelayIDs( Context context, long[][] rowIDs ) - { - String[] result = null; - String[] columns = { ROW_ID, DBHelper.RELAYID }; - String selection = DBHelper.RELAYID + " NOT null"; - ArrayList ids = new ArrayList<>(); - - initDB( context ); - synchronized( s_dbHelper ) { - Cursor cursor = query( TABLE_NAMES.SUM, columns, selection ); - int count = cursor.getCount(); - if ( 0 < count ) { - result = new String[count]; - if ( null != rowIDs ) { - rowIDs[0] = new long[count]; - } - - int idIndex = cursor.getColumnIndex(DBHelper.RELAYID); - int rowIndex = cursor.getColumnIndex(ROW_ID); - for ( int ii = 0; cursor.moveToNext(); ++ii ) { - result[ii] = cursor.getString( idIndex ); - if ( null != rowIDs ) { - rowIDs[0][ii] = cursor.getLong( rowIndex ); - } - } - } - cursor.close(); - } - - return result; - } - - public static boolean haveRelayIDs( Context context ) - { - long[][] rowIDss = new long[1][]; - String[] relayIDs = getRelayIDs( context, rowIDss ); - boolean result = null != relayIDs && 0 < relayIDs.length; - return result; - } - - public static void addDeceased( Context context, String relayID, - int seed ) - { - ContentValues values = new ContentValues(); - values.put( DBHelper.RELAYID, relayID ); - values.put( DBHelper.SEED, seed ); - - initDB( context ); - synchronized( s_dbHelper ) { - - try { - long result = s_db.replaceOrThrow( TABLE_NAMES.OBITS.toString(), - "", values ); - } catch ( Exception ex ) { - Log.ex( TAG, ex ); - } - } - } - - public static Obit[] listObits( Context context ) - { - Obit[] result = null; - ArrayList al = new ArrayList<>(); - String[] columns = { DBHelper.RELAYID, DBHelper.SEED }; - - initDB( context ); - synchronized( s_dbHelper ) { - Cursor cursor = query( TABLE_NAMES.OBITS, columns, null ); - if ( 0 < cursor.getCount() ) { - int idIndex = cursor.getColumnIndex( DBHelper.RELAYID ); - int seedIndex = cursor.getColumnIndex( DBHelper.SEED ); - while ( cursor.moveToNext() ) { - String relayID = cursor.getString( idIndex ); - int seed = cursor.getInt( seedIndex ); - al.add( new Obit( relayID, seed ) ); - } - } - cursor.close(); - } - - int siz = al.size(); - if ( siz > 0 ) { - result = al.toArray( new Obit[siz] ); - } - return result; - } - - public static void clearObits( Context context, Obit[] obits ) - { - String fmt = DBHelper.RELAYID + "= \"%s\" AND + " - + DBHelper.SEED + " = %d"; - - initDB( context ); - synchronized( s_dbHelper ) { - - for ( Obit obit: obits ) { - String selection = String.format( fmt, obit.m_relayID, - obit.m_seed ); - delete( TABLE_NAMES.OBITS, selection ); - } - } - } - public static GameLock saveNewGame( Context context, byte[] bytes, long groupID, String name ) { diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java index bede24c9d..f5a0a5444 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java @@ -599,11 +599,6 @@ public abstract class DelegateBase implements DlgClickNotify, return m_dlgDelegate.post( runnable ); } - protected void doSyncMenuitem() - { - m_dlgDelegate.doSyncMenuitem(); - } - protected void launchLookup( String[] words, int lang, boolean noStudy ) { m_dlgDelegate.launchLookup( words, lang, noStudy ); diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java index 02169c939..98e36c4cb 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java @@ -39,7 +39,6 @@ public class DlgDelegate { // GameListDelegate RESET_GAMES, - SYNC_MENU, NEW_FROM, DELETE_GAMES, DELETE_GROUPS, @@ -63,7 +62,6 @@ public class DlgDelegate { // BoardDelegate UNDO_LAST_ACTION, LAUNCH_INVITE_ACTION, - SYNC_ACTION, COMMIT_ACTION, SHOW_EXPL_ACTION, PREV_HINT_ACTION, @@ -416,18 +414,6 @@ public class DlgDelegate { m_dlgt.show( state ); } - // Get rid of this? - public void doSyncMenuitem() - { - Log.d( TAG, "doSyncMenuitem()" ); - if ( null == DBUtils.getRelayIDs( m_activity, null ) ) { - makeOkOnlyBuilder( R.string.no_games_to_refresh ).show(); - } else { - TimerReceiver.allTimersFired( m_activity ); - Utils.showToast( m_activity, R.string.msgs_progress ); - } - } - public void launchLookup( String[] words, int lang, boolean noStudy ) { m_dlgt.show( LookupAlert.newInstance( words, lang, noStudy ) ); 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 d0a01c6a6..25da920a0 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 @@ -1295,24 +1295,13 @@ public class GameUtils { // deleting on relay half-games that we created but nobody // joined, special-case this one. if ( summary.inRelayGame() ) { - tellRelayDied( context, summary, informNow ); + Assert.failDbg(); } } } } } - private static void tellRelayDied( Context context, GameSummary summary, - boolean informNow ) - { - if ( null != summary.relayID ) { - DBUtils.addDeceased( context, summary.relayID, summary.seed ); - if ( informNow ) { - NetUtils.informOfDeaths( context ); - } - } - } - private static File makeJsonFor( File dir, NetLaunchInfo nli ) { File result = null; diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java index 64b819022..3c461b83c 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java @@ -556,7 +556,6 @@ public class GamesListDelegate extends ListDelegateBase R.id.games_menu_dicts, R.id.games_menu_about, R.id.games_menu_email, - R.id.games_menu_checkmoves, }; private static final int[] ONEGAME_ITEMS = { R.id.games_game_config, @@ -1041,8 +1040,6 @@ public class GamesListDelegate extends ListDelegateBase } } ); - NetUtils.informOfDeaths( m_activity ); - post( new Runnable() { @Override public void run() { @@ -1438,9 +1435,6 @@ public class GamesListDelegate extends ListDelegateBase mkListAdapter(); // required because position may change } break; - case SYNC_MENU: - doSyncMenuitem(); - break; case NEW_FROM: long curID = (Long)params[0]; long newid = GameUtils.dupeGame( m_activity, curID ); @@ -1782,14 +1776,6 @@ public class GamesListDelegate extends ListDelegateBase DictsDelegate.start( getDelegator() ); break; - // Get rid of this??? - case R.id.games_menu_checkmoves: - makeNotAgainBuilder( R.string.not_again_sync, - R.string.key_notagain_sync, - Action.SYNC_MENU ) - .show(); - break; - case R.id.games_menu_checkupdates: UpdateCheckReceiver.checkVersions( m_activity, true ); break; @@ -2747,8 +2733,6 @@ public class GamesListDelegate extends ListDelegateBase } invalidateOptionsMenuIf(); setTitle(); - - NetUtils.informOfDeaths( m_activity ); } private boolean makeNewNetGameIf() diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTCheckBoxPreference.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTCheckBoxPreference.java index d76ecaf8b..2f00eec8a 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTCheckBoxPreference.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTCheckBoxPreference.java @@ -1,6 +1,6 @@ /* -*- compile-command: "find-and-gradle.sh inXw4dDeb"; -*- */ /* - * Copyright 2009 - 2012 by Eric House (xwords@eehouse.org). All + * Copyright 2009 - 2022 by Eric House (xwords@eehouse.org). All * rights reserved. * * This program is free software; you can redistribute it and/or diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java index 07e088d00..20b0c7663 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java @@ -54,13 +54,6 @@ public class NetUtils { private static final String TAG = NetUtils.class.getSimpleName(); public static final String k_PARAMS = "params"; - public static final byte PROTOCOL_VERSION = 0; - // from xwrelay.h - public static byte PRX_PUB_ROOMS = 1; - public static byte PRX_HAS_MSGS = 2; - public static byte PRX_DEVICE_GONE = 3; - public static byte PRX_GET_MSGS = 4; - public static byte PRX_PUT_MSGS = 5; public static Socket makeProxySocket( Context context, int timeoutMillis ) @@ -83,50 +76,6 @@ public class NetUtils { return socket; } - private static class InformThread extends Thread { - Context m_context; - DBUtils.Obit[] m_obits; - public InformThread( Context context, DBUtils.Obit[] obits ) - { - m_context = context; - m_obits = obits; - } - - @Override - public void run() - { - try { - JSONArray params = new JSONArray(); - for ( int ii = 0; ii < m_obits.length; ++ii ) { - JSONObject one = new JSONObject(); - one.put( "relayID", m_obits[ii].m_relayID ); - one.put( "seed", m_obits[ii].m_seed ); - params.put( one ); - } - HttpsURLConnection conn = makeHttpsRelayConn( m_context, "kill" ); - String resStr = runConn( conn, params ); - Log.d( TAG, "runViaWeb(): kill(%s) => %s", params, resStr ); - - if ( null != resStr ) { - JSONObject result = new JSONObject( resStr ); - if ( 0 == result.optInt( "err", -1 ) ) { - DBUtils.clearObits( m_context, m_obits ); - } - } - } catch ( JSONException ex ) { - Assert.failDbg(); - } - } - } - - public static void informOfDeaths( Context context ) - { - DBUtils.Obit[] obits = DBUtils.listObits( context ); - if ( null != obits && 0 < obits.length ) { - new InformThread( context, obits ).start(); - } - } - private static String urlForGameID( Context context, int gameID ) { String host = XWPrefs.getPrefsString( context, R.string.key_mqtt_host ); @@ -153,12 +102,13 @@ public class NetUtils { } } - private static final String FORCE_RELAY_HOST = null; - // private static final String FORCE_RELAY_HOST = "eehouse.org"; + private static final String FORCE_HOST = null + // "eehouse.org" + ; public static String forceHost( String host ) { - if ( null != FORCE_RELAY_HOST ) { - host = FORCE_RELAY_HOST; + if ( null != FORCE_HOST ) { + host = FORCE_HOST; } return host; } @@ -184,13 +134,6 @@ public class NetUtils { context.startActivity( intent ); } - protected static HttpsURLConnection makeHttpsRelayConn( Context context, - String proc ) - { - String url = XWPrefs.getDefaultRelayUrl( context ); - return makeHttpsConn( context, url, proc ); - } - public static HttpsURLConnection makeHttpsMQTTConn( Context context, String proc ) { diff --git a/xwords4/android/app/src/main/res/drawable/stat_notify_sync.png b/xwords4/android/app/src/main/res/drawable/stat_notify_sync.png deleted file mode 100644 index c62784e8c5d3d869c0fad60924f5a72f1664cf8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4268 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 diff --git a/xwords4/android/app/src/main/res/menu-small/board_menu.xml b/xwords4/android/app/src/main/res/menu-small/board_menu.xml index 7e9f505a3..7544fe79c 100644 --- a/xwords4/android/app/src/main/res/menu-small/board_menu.xml +++ b/xwords4/android/app/src/main/res/menu-small/board_menu.xml @@ -86,10 +86,6 @@ android:title="@string/gamel_menu_study" /> - - - - - - key_last_packet key_udp_interval - key_notagain_sync key_notagain_newselect key_notagain_emptybtscan key_notagain_backclears diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml index 947ae19d8..be6b321d2 100644 --- a/xwords4/android/app/src/main/res/values/strings.xml +++ b/xwords4/android/app/src/main/res/values/strings.xml @@ -87,11 +87,6 @@ Wordlists… App Settings… - - Check for moves Checking relay for moves etc… @@ -1350,10 +1345,6 @@ - - This action checks the relay for - pending moves/messages for all networked games. You are entering tile-exchange mode.\n\nTap tiles to add/remove them from the set to be