Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-30 10:26:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix sig mismatch between jni and java

Browse source
This commit is contained in:
Eric House 2022-07-09 07:47:44 -07:00
parent 8c598c8aca
commit dac0727c40
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
View file

@ -2025,7 +2025,7 @@ public class BoardDelegate extends DelegateBase
}
@Override
public void informNetDict( ISOCode isoCode, String oldName,
public void informNetDict( String isoCodeStr, String oldName,
String newName, String newSum,
CurGameInfo.XWPhoniesChoice phonies )
{
@ -2048,6 +2048,7 @@ public class BoardDelegate extends DelegateBase
DlgID dlgID;
msg = getString( R.string.inform_dict_diffdict_fmt,
oldName, newName, newName );
ISOCode isoCode = ISOCode.newIf( isoCodeStr );
if ( DictLangCache.haveDict( m_activity, isoCode,
newName ) ) {
dlgID = DlgID.DLG_USEDICT;

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxt.java
View file

@ -105,7 +105,7 @@ public interface UtilCtxt {
void informMove( int turn, String expl, String words );
void informUndo();
void informNetDict( ISOCode isoCode, String oldName, String newName,
void informNetDict( String isoCodeStr, String oldName, String newName,
String newSum, CurGameInfo.XWPhoniesChoice phonies );
void informMissing( boolean isServer, CommsConnTypeSet connTypes,

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxtImpl.java
View file

@ -218,7 +218,7 @@ public class UtilCtxtImpl implements UtilCtxt {
}
@Override
public void informNetDict( ISOCode isoCode, String oldName,
public void informNetDict( String isoCodeStr, String oldName,
String newName, String newSum,
CurGameInfo.XWPhoniesChoice phonies )
{

4
xwords4/android/jni/utilwrapper.c
View file

@ -245,7 +245,7 @@ and_util_informUndo( XW_UtilCtxt* uc, XWEnv xwe )
}
static void
and_util_informNetDict( XW_UtilCtxt* uc, XWEnv xwe, const XP_UCHAR* isoCode,
and_util_informNetDict( XW_UtilCtxt* uc, XWEnv xwe, const XP_UCHAR* isoCodeStr,
const XP_UCHAR* oldName, const XP_UCHAR* newName,
const XP_UCHAR* newSum, XWPhoniesChoice phoniesAction )
{
@ -254,7 +254,7 @@ and_util_informNetDict( XW_UtilCtxt* uc, XWEnv xwe, const XP_UCHAR* isoCode,
"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;"
"Ljava/lang/String;L"
PKG_PATH("jni/CurGameInfo$XWPhoniesChoice") ";)V" );
jstring jIsoCode = (*env)->NewStringUTF( env, isoCode );
jstring jIsoCode = (*env)->NewStringUTF( env, isoCodeStr );
jstring jnew = (*env)->NewStringUTF( env, newName );
jstring jsum = (*env)->NewStringUTF( env, newSum );
jstring jold = (*env)->NewStringUTF( env, oldName );