Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'android_branch' into android_dictdb

Browse source
This commit is contained in:
Eric House 2012-09-13 05:40:08 -07:00
commit edc6b9c270
7 changed files with 83 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
xwords4/android/XWords4/jni/anddict.c
View file

@ -340,6 +340,23 @@ parseDict( AndDictionaryCtxt* ctxt, XP_U8 const* ptr, XP_U32 dictLength,
goto error;
}
if ( NULL == ctxt->super.md5Sum
#ifdef DEBUG
|| XP_TRUE
#endif
) {
JNIEnv* env = ctxt->env;
jstring jsum = and_util_figureMD5Sum( ctxt->jniutil, ptr, end - ptr );
XP_UCHAR* md5Sum = getStringCopy( MPPARM(ctxt->super.mpool) env, jsum );
(*env)->DeleteLocalRef( env, jsum );
if ( NULL == ctxt->super.md5Sum ) {
ctxt->super.md5Sum = md5Sum;
} else {
XP_ASSERT( 0 == XP_STRCMP( ctxt->super.md5Sum, md5Sum ) );
XP_FREE( ctxt->super.mpool, md5Sum );
}
}
ctxt->super.nodeSize = nodeSize;
if ( !isUTF8 ) {

26
xwords4/android/XWords4/jni/jniutlswrapper.c
View file

@ -84,14 +84,24 @@ and_util_splitFaces( JNIUtilCtxt* jniutil, const XP_U8* bytes, jsize len,
= getMethodID( env, jniutil->jjniutil, "splitFaces",
"([BZ)[Ljava/lang/String;" );
jbyteArray jbytes = (*env)->NewByteArray( env, len );
jbyte* jp = (*env)->GetByteArrayElements( env, jbytes, NULL );
XP_MEMCPY( jp, bytes, len );
(*env)->ReleaseByteArrayElements( env, jbytes, jp, 0 );
strarray = (*env)->CallObjectMethod( env, jniutil->jjniutil, mid, jbytes,
isUTF8 );
jbyteArray jbytes = makeByteArray( env, len, (jbyte*)bytes );
strarray =
(*env)->CallObjectMethod( env, jniutil->jjniutil, mid, jbytes, isUTF8 );
(*env)->DeleteLocalRef( env, jbytes );
return strarray;
}
jstring
and_util_figureMD5Sum( JNIUtilCtxt* jniutil, const XP_U8* bytes, jsize len )
{
JNIEnv* env = *jniutil->envp;
jmethodID mid = getMethodID( env, jniutil->jjniutil, "figureMD5Sum",
"([B)Ljava/lang/String;" );
jbyteArray jbytes = makeByteArray( env, len, (jbyte*)bytes );
jstring sum =
(*env)->CallObjectMethod( env, jniutil->jjniutil, mid, jbytes );
(*env)->DeleteLocalRef( env, jbytes );
return sum;
}

2
xwords4/android/XWords4/jni/jniutlswrapper.h
View file

@ -35,5 +35,7 @@ jobject and_util_makeJBitmap( JNIUtilCtxt* jniu, int nCols, int nRows,
const jboolean* colors );
jobject and_util_splitFaces( JNIUtilCtxt* jniu, const XP_U8* bytes, int len,
XP_Bool isUTF8 );
jstring and_util_figureMD5Sum( JNIUtilCtxt* jniutil, const XP_U8* bytes,
jsize len );
#endif

13
xwords4/android/XWords4/src/org/eehouse/android/xw4/DictUtils.java
View file

@ -555,18 +555,7 @@ public class DictUtils {
DbgUtils.loge( ioe );
}
if ( null != digest ) {
final char[] hexArray = {'0','1','2','3','4','5','6','7','8','9',
'a','b','c','d','e','f'};
char[] chars = new char[digest.length * 2];
for ( int ii = 0; ii < digest.length; ii++ ) {
int byt = digest[ii] & 0xFF;
chars[ii * 2] = hexArray[byt >> 4];
chars[ii * 2 + 1] = hexArray[byt & 0x0F];
}
result = new String(chars);
}
return result;
return Utils.digestToString( digest );
} // figureMD5Sum
public static String getMD5SumFor( Context context, DictAndLoc dandl )

17
xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java
View file

@ -345,6 +345,23 @@ public class Utils {
return context.getString( id, args );
}
public static String digestToString( byte[] digest )
{
String result = null;
if ( null != digest ) {
final char[] hexArray = {'0','1','2','3','4','5','6','7','8','9',
'a','b','c','d','e','f'};
char[] chars = new char[digest.length * 2];
for ( int ii = 0; ii < digest.length; ii++ ) {
int byt = digest[ii] & 0xFF;
chars[ii * 2] = hexArray[byt >> 4];
chars[ii * 2 + 1] = hexArray[byt & 0x0F];
}
result = new String(chars);
}
return result;
}
private static void setFirstBootStatics( Context context )
{
int thisVersion = 0;

1
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIUtils.java
View file

@ -26,4 +26,5 @@ public interface JNIUtils {
// Stuff I can't do in C....
String[] splitFaces( byte[] chars, boolean isUTF8 );
String figureMD5Sum( byte[] bytes );
}

28
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIUtilsImpl.java
View file

@ -20,11 +20,12 @@
package org.eehouse.android.xw4.jni;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.Bitmap;
import java.util.ArrayList;
import android.graphics.drawable.BitmapDrawable;
import java.io.ByteArrayInputStream;
import java.io.InputStreamReader;
import java.security.MessageDigest;
import java.util.ArrayList;
import org.eehouse.android.xw4.*;
@ -86,4 +87,27 @@ public class JNIUtilsImpl implements JNIUtils {
String[] result = al.toArray( new String[al.size()] );
return result;
}
public String figureMD5Sum( byte[] bytes )
{
byte[] digest = null;
try {
MessageDigest md = MessageDigest.getInstance("MD5");
byte[] buf = new byte[128];
int nLeft = bytes.length;
int offset = 0;
while ( 0 < nLeft ) {
int len = Math.min( buf.length, nLeft );
System.arraycopy( bytes, offset, buf, 0, len );
md.update( buf, 0, len );
nLeft -= len;
offset += len;
}
digest = md.digest();
} catch ( java.security.NoSuchAlgorithmException nsae ) {
DbgUtils.loge( nsae );
}
return Utils.digestToString( digest );
}
}