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

fix NPE when serializing

Browse source
This commit is contained in:
Eric House 2014-03-19 20:17:53 -07:00
parent c333e561af
commit e7708ef439
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgState.java
View file

@ -84,7 +84,7 @@ public class DlgState implements Parcelable {
public void writeToParcel( Parcel out, int flags ) { public void writeToParcel( Parcel out, int flags ) {
out.writeInt( m_id.ordinal() ); out.writeInt( m_id.ordinal() );
out.writeInt( m_posButton ); out.writeInt( m_posButton );
out.writeInt( m_action.ordinal() ); out.writeInt( null == m_action ? -1 : m_action.ordinal() );
out.writeInt( m_prefsKey ); out.writeInt( m_prefsKey );
out.writeString( m_msg ); out.writeString( m_msg );
} }
@ -94,7 +94,8 @@ public class DlgState implements Parcelable {
public DlgState createFromParcel(Parcel in) { public DlgState createFromParcel(Parcel in) {
DlgID id = DlgID.values()[in.readInt()]; DlgID id = DlgID.values()[in.readInt()];
int posButton = in.readInt(); int posButton = in.readInt();
Action action = Action.values()[in.readInt()]; int tmp = in.readInt();
Action action = 0 > tmp ? null : Action.values()[tmp];
int prefsKey = in.readInt(); int prefsKey = in.readInt();
String msg = in.readString(); String msg = in.readString();
return new DlgState( id, msg, posButton, action, prefsKey ); return new DlgState( id, msg, posButton, action, prefsKey );