mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2024-12-28 09:58:30 +01:00
fix formatting -- no code change
This commit is contained in:
parent
00be532c96
commit
ed1e2a0812
5 changed files with 31 additions and 31 deletions
|
@ -150,7 +150,7 @@ public class BoardActivity extends XWActivity
|
|||
private boolean m_gameOver = false;
|
||||
|
||||
// call startActivityForResult synchronously
|
||||
private Semaphore m_forResultWait = new Semaphore(0);
|
||||
private Semaphore m_forResultWait = new Semaphore(0);
|
||||
private int m_resultCode;
|
||||
|
||||
private Thread m_blockingThread;
|
||||
|
|
|
@ -37,48 +37,48 @@ public class FirstRunDialog {
|
|||
{
|
||||
String page = null;
|
||||
InputStream inputStream = null;
|
||||
try {
|
||||
try {
|
||||
inputStream = context.getResources()
|
||||
.openRawResource(R.raw.changes);
|
||||
|
||||
final char[] buf = new char[0x1000];
|
||||
StringBuilder stringBuilder = new StringBuilder();
|
||||
Reader reader = new InputStreamReader( inputStream, "UTF-8" );
|
||||
int nRead;
|
||||
do {
|
||||
|
||||
final char[] buf = new char[0x1000];
|
||||
StringBuilder stringBuilder = new StringBuilder();
|
||||
Reader reader = new InputStreamReader( inputStream, "UTF-8" );
|
||||
int nRead;
|
||||
do {
|
||||
nRead = reader.read( buf, 0, buf.length );
|
||||
if ( nRead > 0 ) {
|
||||
stringBuilder.append( buf, 0, nRead );
|
||||
}
|
||||
} while ( nRead >= 0 );
|
||||
|
||||
page = stringBuilder.toString();
|
||||
}
|
||||
catch ( IOException ioe ) {
|
||||
DbgUtils.loge( ioe );
|
||||
}
|
||||
finally {
|
||||
} while ( nRead >= 0 );
|
||||
|
||||
page = stringBuilder.toString();
|
||||
}
|
||||
catch ( IOException ioe ) {
|
||||
DbgUtils.loge( ioe );
|
||||
}
|
||||
finally {
|
||||
// could just catch NPE....
|
||||
if ( null != inputStream ) {
|
||||
try {
|
||||
inputStream.close();
|
||||
} catch ( IOException ioe ) {
|
||||
if ( null != inputStream ) {
|
||||
try {
|
||||
inputStream.close();
|
||||
} catch ( IOException ioe ) {
|
||||
DbgUtils.loge( ioe );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// This won't support e.g mailto refs. Probably want to
|
||||
// launch the browser with an intent eventually.
|
||||
WebView view = new WebView( context );
|
||||
view.loadData( page, "text/html", "utf-8" );
|
||||
WebView view = new WebView( context );
|
||||
view.loadData( page, "text/html", "utf-8" );
|
||||
|
||||
AlertDialog dialog = new AlertDialog.Builder( context )
|
||||
AlertDialog dialog = new AlertDialog.Builder( context )
|
||||
.setIcon(android.R.drawable.ic_menu_info_details)
|
||||
.setTitle( R.string.changes_title )
|
||||
.setView( view )
|
||||
.setPositiveButton( R.string.button_ok, null)
|
||||
.create();
|
||||
dialog.show();
|
||||
dialog.show();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ public class GCMIntentService extends GCMBaseIntentService {
|
|||
super( GCMConsts.SENDER_ID );
|
||||
}
|
||||
|
||||
@Override
|
||||
@Override
|
||||
protected void onError( Context context, String error )
|
||||
{
|
||||
DbgUtils.logf("GCMIntentService.onError(%s)", error );
|
||||
|
|
|
@ -282,7 +282,7 @@ public class GameUtils {
|
|||
}
|
||||
|
||||
public static long saveNewGame( Context context, int gamePtr,
|
||||
CurGameInfo gi )
|
||||
CurGameInfo gi )
|
||||
{
|
||||
byte[] stream = XwJNI.game_saveToStream( gamePtr, gi );
|
||||
GameLock lock = DBUtils.saveNewGame( context, stream );
|
||||
|
|
|
@ -60,7 +60,7 @@ public class Utils {
|
|||
public static final int TURN_COLOR = 0x7F00FF00;
|
||||
|
||||
private static final String DB_PATH = "XW_GAMES";
|
||||
private static final String HIDDEN_PREFS = "xwprefs_hidden";
|
||||
private static final String HIDDEN_PREFS = "xwprefs_hidden";
|
||||
private static final String SHOWN_VERSION_KEY = "SHOWN_VERSION_KEY";
|
||||
|
||||
private static Boolean s_isFirstBootThisVersion = null;
|
||||
|
|
Loading…
Reference in a new issue