Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-30 10:26:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'android_branch' into android_sdk_23_take_3

Browse source
This commit is contained in:
Eric House 2016-12-17 16:38:39 -08:00
commit 09188bc704
2 changed files with 10 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xwords4/android/XWords4/src/org/eehouse/android/xw4/InviteDelegate.java
View file

@ -221,9 +221,6 @@ abstract class InviteDelegate extends ListDelegateBase
{
int count = m_checked.size();
m_inviteButton.setEnabled( count > 0 && count <= m_nMissing );
// if ( null != m_clearButton ) {
// m_clearButton.setEnabled( count > 0 );
// }
}
final Set<Integer> getChecked() { return m_checked; }

48
xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteDelegate.java
View file

@ -176,6 +176,7 @@ public class SMSInviteDelegate extends InviteDelegate
self.makeConfirmThenBuilder( R.string.warn_unlimited,
Action.POST_WARNING_ACTION )
.setPosButton( R.string.button_yes )
.setParams( number, null )
.show();
}
};
@ -221,7 +222,10 @@ public class SMSInviteDelegate extends InviteDelegate
m_immobileConfirmed = true;
break;
case POST_WARNING_ACTION:
addChecked( new PhoneRec( m_pendingName, m_pendingNumber ) );
Assert.assertTrue( ((String)params[0]).equals(m_pendingNumber) );
Assert.assertTrue( params[1] == null
|| ((String)params[1]).equals(m_pendingName) );
m_phoneRecs.add( new PhoneRec( m_pendingName, m_pendingNumber ) );
saveAndRebuild();
break;
}
@ -237,20 +241,6 @@ public class SMSInviteDelegate extends InviteDelegate
}
}
private int countChecks()
{
int count = 0;
if ( null != m_phoneRecs ) {
Iterator<PhoneRec> iter = m_phoneRecs.iterator();
while ( iter.hasNext() ) {
if ( iter.next().m_isChecked ) {
++count;
}
}
}
return count;
}
private void addPhoneNumbers( Intent intent )
{
Uri data = intent.getData();
@ -281,6 +271,7 @@ public class SMSInviteDelegate extends InviteDelegate
makeConfirmThenBuilder( R.string.warn_unlimited,
Action.POST_WARNING_ACTION )
.setPosButton( R.string.button_yes )
.setParams( number, name )
.show();
} else {
m_immobileConfirmed = false;
@ -319,8 +310,7 @@ public class SMSInviteDelegate extends InviteDelegate
m_phoneRecs = new ArrayList<PhoneRec>(phones.length);
for ( String phone : phones ) {
boolean matches = phone.equals( m_lastDev );
PhoneRec rec = new PhoneRec( null, phone, matches );
PhoneRec rec = new PhoneRec( null, phone );
m_phoneRecs.add( rec );
}
}
@ -338,19 +328,6 @@ public class SMSInviteDelegate extends InviteDelegate
rebuildList( false );
}
private void addChecked( PhoneRec rec )
{
if ( m_nMissing <= countChecks() ) {
Iterator<PhoneRec> iter = m_phoneRecs.iterator();
while ( iter.hasNext() ) {
iter.next().m_isChecked = false;
}
}
rec.m_isChecked = true;
m_phoneRecs.add( rec );
}
private void clearSelectedImpl()
{
Set<Integer> checked = getChecked();
@ -366,20 +343,15 @@ public class SMSInviteDelegate extends InviteDelegate
private class PhoneRec implements InviterItem {
public String m_phone;
public String m_name;
public boolean m_isChecked;
public PhoneRec( String name, String phone )
{
this( name, phone, false );
}
public PhoneRec( String phone )
{
this( null, phone, false );
this( null, phone );
}
private PhoneRec( String name, String phone, boolean checked )
private PhoneRec( String name, String phone )
{
m_phone = phone;
m_isChecked = checked;
if ( null == name ) {
name = Utils.phoneToContact( m_activity, phone, false );