Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-07 20:46:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'android_branch' into making-it-work-with-api26

Browse source
This commit is contained in:
Eric House 2018-09-13 14:11:30 -07:00
commit 6f6c3238d4
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/app/build.gradle
View file

@ -205,7 +205,7 @@ dependencies {
// 2.6.8 is probably as far forward as I can go without upping my // 2.6.8 is probably as far forward as I can go without upping my
// min-supported SDK version // min-supported SDK version
xw4dImplementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') { xw4dImplementation('com.crashlytics.sdk.android:crashlytics:2.6.3@aar') {
transitive = true; transitive = true;
} }
} }

13
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
View file

@ -453,7 +453,7 @@ public class DBUtils {
public long m_rowid; public long m_rowid;
private ArrayList<InviteMeans> m_means; private ArrayList<InviteMeans> m_means;
private ArrayList<String> m_targets; private ArrayList<String> m_targets;
private ArrayList<Timestamp> m_timestamps; private ArrayList<Date> m_timestamps;
private int m_cachedCount = 0; private int m_cachedCount = 0;
@Override @Override
@ -476,10 +476,10 @@ public class DBUtils {
m_rowid = rowID; m_rowid = rowID;
m_means = new ArrayList<InviteMeans>(); m_means = new ArrayList<InviteMeans>();
m_targets = new ArrayList<String>(); m_targets = new ArrayList<String>();
m_timestamps = new ArrayList<Timestamp>(); m_timestamps = new ArrayList<Date>();
} }
private void addEntry( InviteMeans means, String target, Timestamp ts ) private void addEntry( InviteMeans means, String target, Date ts )
{ {
m_means.add( means ); m_means.add( means );
m_targets.add( target ); m_targets.add( target );
@ -586,7 +586,10 @@ public class DBUtils {
{ {
SentInvitesInfo result = new SentInvitesInfo( rowid ); SentInvitesInfo result = new SentInvitesInfo( rowid );
String[] columns = { DBHelper.MEANS, DBHelper.TIMESTAMP, DBHelper.TARGET }; String[] columns = { DBHelper.MEANS, DBHelper.TARGET,
" (strftime('%s', " + DBHelper.TIMESTAMP
+ ") * 1000) AS " + DBHelper.TIMESTAMP,
};
String selection = String.format( "%s = %d", DBHelper.ROW, rowid ); String selection = String.format( "%s = %d", DBHelper.ROW, rowid );
String orderBy = DBHelper.TIMESTAMP + " DESC"; String orderBy = DBHelper.TIMESTAMP + " DESC";
@ -600,7 +603,7 @@ public class DBUtils {
while ( cursor.moveToNext() ) { while ( cursor.moveToNext() ) {
InviteMeans means = InviteMeans.values()[cursor.getInt( indxMns )]; InviteMeans means = InviteMeans.values()[cursor.getInt( indxMns )];
Timestamp ts = Timestamp.valueOf(cursor.getString(indxTS)); Date ts = new Date(cursor.getLong(indxTS));
String target = cursor.getString( indxTrgt ); String target = cursor.getString( indxTrgt );
result.addEntry( means, target, ts ); result.addEntry( means, target, ts );
} }