Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-04 23:02:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deal with SMS and BT-type address recs.

Browse source
This commit is contained in:
eehouse 2010-02-09 14:26:43 +00:00
parent 1f7e6db585
commit cd63cf1424
1 changed files with 36 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
xwords4/android/XWords4/jni/andutils.c
View file

@ -286,43 +286,61 @@ void
setJAddrRec( JNIEnv* env, jobject jaddr, const CommsAddrRec* addr ) setJAddrRec( JNIEnv* env, jobject jaddr, const CommsAddrRec* addr )
{ {
LOG_FUNC(); LOG_FUNC();
setInt( env, jaddr, "ip_relay_port", addr->u.ip_relay.port ); XP_ASSERT( !!addr );
setString( env, jaddr, "ip_relay_hostName", addr->u.ip_relay.hostName );
setString( env, jaddr, "ip_relay_invite", addr->u.ip_relay.invite );
intToJenumField( env, jaddr, addr->conType, "conType", intToJenumField( env, jaddr, addr->conType, "conType",
"org/eehouse/android/xw4/jni/CommsAddrRec$CommsConnType" ); "org/eehouse/android/xw4/jni/CommsAddrRec$CommsConnType" );
/* Later switch off of it... */ switch ( addr->conType ) {
XP_ASSERT( addr->conType == COMMS_CONN_RELAY ); case COMMS_CONN_RELAY:
setInt( env, jaddr, "ip_relay_port", addr->u.ip_relay.port );
setString( env, jaddr, "ip_relay_hostName", addr->u.ip_relay.hostName );
setString( env, jaddr, "ip_relay_invite", addr->u.ip_relay.invite );
break;
case COMMS_CONN_SMS:
setString( env, jaddr, "sms_phone", addr->u.sms.phone );
XP_LOGF( "%s: got SMS; phone=%s", __func__, addr->u.sms.phone );
setInt( env, jaddr, "sms_port", addr->u.sms.port );
break;
case COMMS_CONN_BT:
default:
XP_ASSERT(0);
}
LOG_RETURN_VOID(); LOG_RETURN_VOID();
} }
void void
getJAddrRec( JNIEnv* env, CommsAddrRec* addr, jobject jaddr ) getJAddrRec( JNIEnv* env, CommsAddrRec* addr, jobject jaddr )
{ {
XP_UCHAR buf[256];
addr->conType = jenumFieldToInt( env, jaddr, "conType", addr->conType = jenumFieldToInt( env, jaddr, "conType",
"org/eehouse/android/xw4/jni/" "org/eehouse/android/xw4/jni/"
"CommsAddrRec$CommsConnType" ); "CommsAddrRec$CommsConnType" );
/* Later switch off of it... */ switch ( addr->conType ) {
XP_ASSERT( addr->conType == COMMS_CONN_RELAY ); case COMMS_CONN_RELAY:
addr->u.ip_relay.port = getInt( env, jaddr, "ip_relay_port" ); addr->u.ip_relay.port = getInt( env, jaddr, "ip_relay_port" );
XP_UCHAR buf[256]; /* in case needs whole path */
getString( env, jaddr, "ip_relay_hostName", addr->u.ip_relay.hostName, getString( env, jaddr, "ip_relay_hostName", addr->u.ip_relay.hostName,
VSIZE(addr->u.ip_relay.hostName) ); VSIZE(addr->u.ip_relay.hostName) );
getString( env, jaddr, "ip_relay_invite", addr->u.ip_relay.invite, getString( env, jaddr, "ip_relay_invite", addr->u.ip_relay.invite,
VSIZE(addr->u.ip_relay.invite) ); VSIZE(addr->u.ip_relay.invite) );
break;
case COMMS_CONN_SMS:
getString( env, jaddr, "sms_phone", addr->u.sms.phone,
VSIZE(addr->u.sms.phone) );
XP_LOGF( "%s: got SMS; phone=%s", __func__, addr->u.sms.phone );
addr->u.sms.port = getInt( env, jaddr, "sms_port" );
break;
case COMMS_CONN_BT:
default:
XP_ASSERT(0);
}
} }
jint jint
jenumFieldToInt( JNIEnv* env, jobject j_gi, const char* field, jenumFieldToInt( JNIEnv* env, jobject j_gi, const char* field,
const char* fieldSig ) const char* fieldSig )
{ {
XP_LOGF( "IN %s(%s)", __func__, fieldSig );
jclass clazz = (*env)->GetObjectClass( env, j_gi ); jclass clazz = (*env)->GetObjectClass( env, j_gi );
XP_ASSERT( !!clazz ); XP_ASSERT( !!clazz );
char sig[128]; char sig[128];
@ -345,7 +363,6 @@ void
intToJenumField( JNIEnv* env, jobject jobj, int val, const char* field, intToJenumField( JNIEnv* env, jobject jobj, int val, const char* field,
const char* fieldSig ) const char* fieldSig )
{ {
XP_LOGF( "IN %s(%d,%s,%s)", __func__, val, field, fieldSig );
jclass clazz = (*env)->GetObjectClass( env, jobj ); jclass clazz = (*env)->GetObjectClass( env, jobj );
XP_ASSERT( !!clazz ); XP_ASSERT( !!clazz );
char buf[128]; char buf[128];
@ -356,7 +373,6 @@ intToJenumField( JNIEnv* env, jobject jobj, int val, const char* field,
jobject jenum = (*env)->GetObjectField( env, jobj, fid ); jobject jenum = (*env)->GetObjectField( env, jobj, fid );
if ( !jenum ) { /* won't exist in new object */ if ( !jenum ) { /* won't exist in new object */
XP_LOGF( "%s: creating new object...", __func__ );
clazz = (*env)->FindClass( env, fieldSig ); clazz = (*env)->FindClass( env, fieldSig );
XP_ASSERT( !!clazz ); XP_ASSERT( !!clazz );
jmethodID mid = getMethodID( env, clazz, "<init>", "()V" ); jmethodID mid = getMethodID( env, clazz, "<init>", "()V" );
@ -385,7 +401,6 @@ intToJenumField( JNIEnv* env, jobject jobj, int val, const char* field,
(*env)->DeleteLocalRef( env, jvalues ); (*env)->DeleteLocalRef( env, jvalues );
(*env)->DeleteLocalRef( env, jval ); (*env)->DeleteLocalRef( env, jval );
(*env)->DeleteLocalRef( env, clazz ); (*env)->DeleteLocalRef( env, clazz );
LOG_RETURN_VOID();
} /* intToJenumField */ } /* intToJenumField */
XWStreamCtxt* XWStreamCtxt*