/android/import-contacts

To get this branch, use:
bzr branch http://bzr.ed.am/android/import-contacts

« back to all changes in this revision

Viewing changes to src/org/waxworlds/importcontacts/MergePrompt.java

  • Committer: edam
  • Date: 2012-12-21 10:44:01 UTC
  • Revision ID: tim@ed.am-20121221104401-onydwv9k4e4heode
- made basic_statement::step() protected, for use by query and command only
- moved basic_statement::operator<<() to command and query instead; one needs to accept sqlite::exec, the other doesn't
- added tests for query::operator<<()
- added code to invlaidate in-progress queries during any transaction rollbacks (currently segfaults in basic_statement::finalize())
- added new sqlite_error constructor that obtains a full error message
- implemented database::database_mutex_guard class
- swapped command's step mutex in favour of the database mutexadded thank you message to intro

Show diffs side-by-side

added added

removed removed

src/org/waxworlds/importcontacts/MergePrompt.java
1
 
package org.waxworlds.importcontacts;
2
 
 
3
 
import android.app.Activity;
4
 
 
5
 
public class MergePrompt extends Activity {
6
 
 
7
 
}