From fcdbed092086aded16250ef56f59d62459127322 Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand>
Date: Thu, 22 Sep 2011 06:49:34 -0700
Subject: [PATCH] fix to work with changed C api

---
 xwords4/android/XWords4/jni/xwjni.c                        | 6 ++----
 .../XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java | 2 +-
 .../XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java     | 7 ++++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/xwords4/android/XWords4/jni/xwjni.c b/xwords4/android/XWords4/jni/xwjni.c
index febedc0ac..b22cb0b40 100644
--- a/xwords4/android/XWords4/jni/xwjni.c
+++ b/xwords4/android/XWords4/jni/xwjni.c
@@ -1242,14 +1242,13 @@ Java_org_eehouse_android_xw4_jni_XwJNI_server_1endGame
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_eehouse_android_xw4_jni_XwJNI_server_1listWordsPlayed
+Java_org_eehouse_android_xw4_jni_XwJNI_model_1getWordsPlayed
 ( JNIEnv* env, jclass C, jint gamePtr, jint nMoves )
 {
     jstring result;
     XWJNI_START_GLOBALS();
-    XP_ASSERT( !!state->game.server );
     XWStreamCtxt* stream = and_empty_stream( MPPARM(mpool) globals );
-    server_listWordsPlayed( state->game.server, stream, nMoves );
+    model_getWordsPlayed( state->game.model, nMoves, stream );
     result = streamToJString( MPPARM(mpool) env, stream );
     (*env)->DeleteLocalRef( env, result );
     stream_destroy( stream );
@@ -1257,7 +1256,6 @@ Java_org_eehouse_android_xw4_jni_XwJNI_server_1listWordsPlayed
     return result;
 }
 
-
 JNIEXPORT void JNICALL
 Java_org_eehouse_android_xw4_jni_XwJNI_server_1sendChat
 ( JNIEnv* env, jclass C, jint gamePtr, jstring jmsg )
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
index c95ac244f..a77ae330d 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
@@ -493,7 +493,7 @@ public class JNIThread extends Thread {
                 break;
 
             case CMD_WORDS:
-                String words = XwJNI.server_listWordsPlayed( m_jniGamePtr, 1 );
+                String words = XwJNI.model_getWordsPlayed( m_jniGamePtr, 1 );
                 Message.obtain( m_handler, GOT_WORDS, words ).sendToTarget();
                 break;
 
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java
index f59e672a8..78b12e291 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java
@@ -202,7 +202,10 @@ public class XwJNI {
     public static native String model_writeGameHistory( int gamePtr, 
                                                         boolean gameOver );
     public static native int model_getNMoves( int gamePtr );
-    public static native String model_getPlayersLastScore( int gamePtr, int player );
+    public static native String model_getPlayersLastScore( int gamePtr, 
+                                                           int player );
+    public static native String model_getWordsPlayed( int gamePtr, 
+                                                      int nTurns );
 
     // Server
     public static native void server_reset( int gamePtr );
@@ -214,8 +217,6 @@ public class XwJNI {
     public static native void server_initClientConnection( int gamePtr );
     public static native void server_endGame( int gamePtr );
     public static native void server_sendChat( int gamePtr, String msg );
-    public static native String server_listWordsPlayed( int gamePtr, 
-                                                        int nMoves );
 
     // hybrid to save work
     public static native boolean board_server_prefsChanged( int gamePtr,