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

Merge branch 'android_branch' into relay_noconn

Browse source 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Eric House 2015-08-26 07:09:56 -07:00
commit db7aa3923b
2 changed files with 24 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
xwords4/android/XWords4/res_src/values-fr/strings.xml
View file

@ -372,8 +372,7 @@ des parties à %1$d joueurs en %2$s.</string>
<!--<string name="no_name_found_fmt">No public rooms found for <!--<string name="no_name_found_fmt">No public rooms found for
%1$d-player games in %2$s. Try refreshing or creating your %1$d-player games in %2$s. Try refreshing or creating your
own.</string>--> own.</string>-->
<string name="no_name_found_fmt">Aucun salon public trouvé pour des parties <string name="no_name_found_fmt">Aucun salon public trouvé pour des parties à %1$d dans %2$s. Essayez de rafraîchir ou de créer le votre.</string>
à %1$d dans %2$s</string>
<!-- text of separator marking out other-setting area of the dialog --> <!-- text of separator marking out other-setting area of the dialog -->
<!--<string name="settings_label">Other settings</string>--> <!--<string name="settings_label">Other settings</string>-->
@ -1475,10 +1474,8 @@ partie : %1$s .</string>
<!--<string name="query_trade_fmt">Êtes-vous sûr de vouloir échanger les %1$d <!--<string name="query_trade_fmt">Êtes-vous sûr de vouloir échanger les %1$d
jetons sélectionnés (%2$s) ?</string>--> jetons sélectionnés (%2$s) ?</string>-->
<plurals name="query_trade_fmt"> <plurals name="query_trade_fmt">
<item quantity="one">Êtes-vous sûr de vouloir échanger le <item quantity="one">Êtes-vous sûr de vouloir échanger le jeton sélectionné (%2$s) ?</item>
jeton sélectionné (%2$s) ?</item> <item quantity="other">Êtes-vous sûr de vouloir échanger les %1$d jetons sélectionnés (%2$s) ?</item>
<item quantity="other">Êtes-vous sûr de vouloir échanger les %1$d
jetons sélectionnés (%2$s) ?</item>
</plurals> </plurals>
<!-- ############################################################ <!-- ############################################################
@ -1971,9 +1968,7 @@ courant.</string>
<!--<string name="not_again_chat">This button opens the screen for <!--<string name="not_again_chat">This button opens the screen for
messaging between devices in this game. Messages will be kept messaging between devices in this game. Messages will be kept
until you delete the game that contains them.</string>--> until you delete the game that contains them.</string>-->
<string name="not_again_chat">Ce bouton ouvre l\'écran de discussion entre <string name="not_again_chat">Ce bouton ouvre l\'écran de discussion entre périphériques pour cette partie. Les messages seront préservés jusqu\'à ce que effaciez la partie qui les contient.</string>
périphériques pour cette partie. Les messages seront préservés jusqu\'à ce que
effaciez la partie qui les contient</string>
<!-- Shown when you tap the values button on the toolbar of the <!-- Shown when you tap the values button on the toolbar of the
main Board screen. This is intended to allow players to main Board screen. This is intended to allow players to
remind themselves how much played tiles are worth while remind themselves how much played tiles are worth while
@ -3127,9 +3122,7 @@ vous doit faire une mise à jour avant de pouvoir continuer.</string>
device. No moves will be sent via Bluetooth.\n\nYou can enable device. No moves will be sent via Bluetooth.\n\nYou can enable
Bluetooth now, or later. Bluetooth now, or later.
</string>--> </string>-->
<string name="warn_bt_disabled">Le Bluetooth est actuellement éteint sur ce <string name="warn_bt_disabled">"Le Bluetooth est actuellement éteint sur ce périphérique. Aucun coup ne sera envoyé par Bluetooth.\n\nVous pouvez activer le Bluetooth maintenant, ou plus tard. "</string>
périphérique. Aucun coup ne sera envoyé par Bluetooth.\n\nVous pouvez activer
le Bluetooth maintenant, ou plus tard.</string>
<!--XLATE-ME--> <!--XLATE-ME-->
<!--<string name="button_enable_sms">Enable SMS</string>--> <!--<string name="button_enable_sms">Enable SMS</string>-->
<string name="button_enable_sms">Activer les SMS</string> <string name="button_enable_sms">Activer les SMS</string>

38
xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java
View file

@ -387,10 +387,10 @@ public class SMSService extends XWService {
{ {
DbgUtils.logf( "SMSService.inviteRemote()" ); DbgUtils.logf( "SMSService.inviteRemote()" );
ByteArrayOutputStream bas = new ByteArrayOutputStream( 128 ); ByteArrayOutputStream bas = new ByteArrayOutputStream( 128 );
DataOutputStream das = new DataOutputStream( bas ); DataOutputStream dos = new DataOutputStream( bas );
try { try {
das.writeUTF( nliData ); dos.writeUTF( nliData );
das.flush(); dos.flush();
send( SMS_CMD.INVITE, bas.toByteArray(), phone ); send( SMS_CMD.INVITE, bas.toByteArray(), phone );
} catch ( java.io.IOException ioe ) { } catch ( java.io.IOException ioe ) {
@ -401,10 +401,10 @@ public class SMSService extends XWService {
private void ackInvite( String phone, int gameID ) private void ackInvite( String phone, int gameID )
{ {
ByteArrayOutputStream bas = new ByteArrayOutputStream( 128 ); ByteArrayOutputStream bas = new ByteArrayOutputStream( 128 );
DataOutputStream das = new DataOutputStream( bas ); DataOutputStream dos = new DataOutputStream( bas );
try { try {
das.writeInt( gameID ); dos.writeInt( gameID );
das.flush(); dos.flush();
send( SMS_CMD.ACK, bas.toByteArray(), phone ); send( SMS_CMD.ACK, bas.toByteArray(), phone );
} catch ( java.io.IOException ioe ) { } catch ( java.io.IOException ioe ) {
@ -416,10 +416,10 @@ public class SMSService extends XWService {
{ {
if ( !s_sentDied.contains(gameID) ) { if ( !s_sentDied.contains(gameID) ) {
ByteArrayOutputStream bas = new ByteArrayOutputStream( 32 ); ByteArrayOutputStream bas = new ByteArrayOutputStream( 32 );
DataOutputStream das = new DataOutputStream( bas ); DataOutputStream dos = new DataOutputStream( bas );
try { try {
das.writeInt( gameID ); dos.writeInt( gameID );
das.flush(); dos.flush();
send( SMS_CMD.DEATH, bas.toByteArray(), phone ); send( SMS_CMD.DEATH, bas.toByteArray(), phone );
s_sentDied.add( gameID ); s_sentDied.add( gameID );
} catch ( java.io.IOException ioe ) { } catch ( java.io.IOException ioe ) {
@ -432,11 +432,11 @@ public class SMSService extends XWService {
{ {
int nSent = -1; int nSent = -1;
ByteArrayOutputStream bas = new ByteArrayOutputStream( 128 ); ByteArrayOutputStream bas = new ByteArrayOutputStream( 128 );
DataOutputStream das = new DataOutputStream( bas ); DataOutputStream dos = new DataOutputStream( bas );
try { try {
das.writeInt( gameID ); dos.writeInt( gameID );
das.write( bytes, 0, bytes.length ); dos.write( bytes, 0, bytes.length );
das.flush(); dos.flush();
if ( send( SMS_CMD.DATA, bas.toByteArray(), phone ) ) { if ( send( SMS_CMD.DATA, bas.toByteArray(), phone ) ) {
nSent = bytes.length; nSent = bytes.length;
} }
@ -450,12 +450,12 @@ public class SMSService extends XWService {
throws java.io.IOException throws java.io.IOException
{ {
ByteArrayOutputStream bas = new ByteArrayOutputStream( 128 ); ByteArrayOutputStream bas = new ByteArrayOutputStream( 128 );
DataOutputStream das = new DataOutputStream( bas ); DataOutputStream dos = new DataOutputStream( bas );
das.writeByte( SMS_PROTO_VERSION ); dos.writeByte( SMS_PROTO_VERSION );
das.writeShort( getNBSPort() ); dos.writeShort( getNBSPort() );
das.writeByte( cmd.ordinal() ); dos.writeByte( cmd.ordinal() );
das.write( bytes, 0, bytes.length ); dos.write( bytes, 0, bytes.length );
das.flush(); dos.flush();
byte[] data = bas.toByteArray(); byte[] data = bas.toByteArray();
byte[][] msgs = breakAndEncode( data ); byte[][] msgs = breakAndEncode( data );