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

docs say not to call cursor.close -- so don't.

Browse source
This commit is contained in:
Eric House 2012-12-27 20:38:31 -08:00
parent 8bba5d6106
commit a6586b6131
1 changed files with 22 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteActivity.java
View file

@ -23,28 +23,22 @@ package org.eehouse.android.xw4;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.content.ContentResolver;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.CommonDataKinds;
import android.provider.ContactsContract; import android.provider.ContactsContract;
import android.text.Editable;
import android.text.TextWatcher;
import android.text.method.DialerKeyListener; import android.text.method.DialerKeyListener;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.ListView;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Iterator; import java.util.Iterator;
import junit.framework.Assert;
public class SMSInviteActivity extends InviteActivity { public class SMSInviteActivity extends InviteActivity {
@ -251,31 +245,30 @@ public class SMSInviteActivity extends InviteActivity {
// long time to return. Be safe. // long time to return. Be safe.
if ( null != cursor && !cursor.isClosed() ) { if ( null != cursor && !cursor.isClosed() ) {
if ( cursor.moveToFirst() ) { if ( cursor.moveToFirst() ) {
String name = String name =
cursor.getString( cursor. cursor.getString( cursor.
getColumnIndex( Phone.DISPLAY_NAME)); getColumnIndex( Phone.DISPLAY_NAME));
String number = String number =
cursor.getString( cursor. cursor.getString( cursor.
getColumnIndex( Phone.NUMBER ) ); getColumnIndex( Phone.NUMBER ) );
int type = cursor.getInt( cursor. int type = cursor.getInt( cursor.
getColumnIndex( Phone.TYPE ) ); getColumnIndex( Phone.TYPE ) );
m_pendingName = name; m_pendingName = name;
m_pendingNumber = number; m_pendingNumber = number;
if ( Phone.TYPE_MOBILE == type ) { if ( Phone.TYPE_MOBILE == type ) {
showConfirmThen( R.string.warn_unlimited, showConfirmThen( R.string.warn_unlimited,
R.string.button_yes, R.string.button_yes,
POST_WARNING_ACTION ); POST_WARNING_ACTION );
} else { } else {
m_immobileConfirmed = false; m_immobileConfirmed = false;
String msg = String msg =
Utils.format( this, R.string.warn_nomobilef, Utils.format( this, R.string.warn_nomobilef,
number, name ); number, name );
showConfirmThen( msg, R.string.button_yes, showConfirmThen( msg, R.string.button_yes,
USE_IMMOBILE_ACTION ); USE_IMMOBILE_ACTION );
} }
} }
cursor.close();
} }
} // addPhoneNumbers } // addPhoneNumbers