|
|
@ -43,7 +43,6 @@ import android.widget.Toast;
|
|
|
|
import net.micode.notes.R;
|
|
|
|
import net.micode.notes.R;
|
|
|
|
import net.micode.notes.data.Notes;
|
|
|
|
import net.micode.notes.data.Notes;
|
|
|
|
import net.micode.notes.data.Notes.NoteColumns;
|
|
|
|
import net.micode.notes.data.Notes.NoteColumns;
|
|
|
|
import net.micode.notes.gtask.remote.GTaskSyncService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public class NotesPreferenceActivity extends PreferenceActivity {
|
|
|
|
public class NotesPreferenceActivity extends PreferenceActivity {
|
|
|
@ -78,7 +77,6 @@ public class NotesPreferenceActivity extends PreferenceActivity {
|
|
|
|
mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY);
|
|
|
|
mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY);
|
|
|
|
mReceiver = new GTaskReceiver();
|
|
|
|
mReceiver = new GTaskReceiver();
|
|
|
|
IntentFilter filter = new IntentFilter();
|
|
|
|
IntentFilter filter = new IntentFilter();
|
|
|
|
filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME);
|
|
|
|
|
|
|
|
registerReceiver(mReceiver, filter);
|
|
|
|
registerReceiver(mReceiver, filter);
|
|
|
|
|
|
|
|
|
|
|
|
mOriAccounts = null;
|
|
|
|
mOriAccounts = null;
|
|
|
@ -131,7 +129,7 @@ public class NotesPreferenceActivity extends PreferenceActivity {
|
|
|
|
accountPref.setSummary(getString(R.string.preferences_account_summary));
|
|
|
|
accountPref.setSummary(getString(R.string.preferences_account_summary));
|
|
|
|
accountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
|
|
|
|
accountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
|
|
|
|
public boolean onPreferenceClick(Preference preference) {
|
|
|
|
public boolean onPreferenceClick(Preference preference) {
|
|
|
|
if (!GTaskSyncService.isSyncing()) {
|
|
|
|
if (false) {
|
|
|
|
if (TextUtils.isEmpty(defaultAccount)) {
|
|
|
|
if (TextUtils.isEmpty(defaultAccount)) {
|
|
|
|
// the first time to set account
|
|
|
|
// the first time to set account
|
|
|
|
showSelectAccountAlertDialog();
|
|
|
|
showSelectAccountAlertDialog();
|
|
|
@ -157,26 +155,23 @@ public class NotesPreferenceActivity extends PreferenceActivity {
|
|
|
|
TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
|
|
|
|
TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
|
|
|
|
|
|
|
|
|
|
|
|
// set button state
|
|
|
|
// set button state
|
|
|
|
if (GTaskSyncService.isSyncing()) {
|
|
|
|
if (false) {
|
|
|
|
syncButton.setText(getString(R.string.preferences_button_sync_cancel));
|
|
|
|
syncButton.setText(getString(R.string.preferences_button_sync_cancel));
|
|
|
|
syncButton.setOnClickListener(new View.OnClickListener() {
|
|
|
|
syncButton.setOnClickListener(new View.OnClickListener() {
|
|
|
|
public void onClick(View v) {
|
|
|
|
public void onClick(View v) {
|
|
|
|
GTaskSyncService.cancelSync(NotesPreferenceActivity.this);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
syncButton.setText(getString(R.string.preferences_button_sync_immediately));
|
|
|
|
syncButton.setText(getString(R.string.preferences_button_sync_immediately));
|
|
|
|
syncButton.setOnClickListener(new View.OnClickListener() {
|
|
|
|
syncButton.setOnClickListener(new View.OnClickListener() {
|
|
|
|
public void onClick(View v) {
|
|
|
|
public void onClick(View v) {
|
|
|
|
GTaskSyncService.startSync(NotesPreferenceActivity.this);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this)));
|
|
|
|
syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this)));
|
|
|
|
|
|
|
|
|
|
|
|
// set last sync time
|
|
|
|
// set last sync time
|
|
|
|
if (GTaskSyncService.isSyncing()) {
|
|
|
|
if (false) {
|
|
|
|
lastSyncTimeView.setText(GTaskSyncService.getProgressString());
|
|
|
|
|
|
|
|
lastSyncTimeView.setVisibility(View.VISIBLE);
|
|
|
|
lastSyncTimeView.setVisibility(View.VISIBLE);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
long lastSyncTime = getLastSyncTime(this);
|
|
|
|
long lastSyncTime = getLastSyncTime(this);
|
|
|
@ -363,11 +358,6 @@ public class NotesPreferenceActivity extends PreferenceActivity {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void onReceive(Context context, Intent intent) {
|
|
|
|
public void onReceive(Context context, Intent intent) {
|
|
|
|
refreshUI();
|
|
|
|
refreshUI();
|
|
|
|
if (intent.getBooleanExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_IS_SYNCING, false)) {
|
|
|
|
|
|
|
|
TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
|
|
|
|
|
|
|
|
syncStatus.setText(intent
|
|
|
|
|
|
|
|
.getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|