arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-06-26 18:02:39 +00:00
Code Issues Releases Wiki Activity

Improve logging in syncmanager and import.

Browse Source
This commit is contained in:
Tom Hacohen 2019-03-21 11:15:24 +00:00
parent 8d660e376a
commit bc829d0d1e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt
View File

@ -129,6 +129,7 @@ constructor(protected val context: Context, protected val account: Account, prot
syncPhase = R.string.sync_phase_prepare_local syncPhase = R.string.sync_phase_prepare_local
Logger.log.info("Sync phase: " + context.getString(syncPhase)) Logger.log.info("Sync phase: " + context.getString(syncPhase))
prepareLocal() prepareLocal()
Logger.log.info("Locally changed: (dirty=${localDirty.size} deleted=${localDeleted?.size}")
do { do {
if (Thread.interrupted()) if (Thread.interrupted())

5
app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportFragment.kt
View File

@ -93,6 +93,7 @@ class ImportFragment : DialogFragment() {
private fun setDialogAddEntries(dialog: ProgressDialog, length: Int) { private fun setDialogAddEntries(dialog: ProgressDialog, length: Int) {
dialog.max = length dialog.max = length
dialog.setMessage(getString(R.string.import_dialog_adding_entries)) dialog.setMessage(getString(R.string.import_dialog_adding_entries))
Logger.log.info("Adding entries. Total: ${length}")
} }
override fun onSaveInstanceState(outState: Bundle) { override fun onSaveInstanceState(outState: Bundle) {
@ -144,7 +145,7 @@ class ImportFragment : DialogFragment() {
if (data != null) { if (data != null) {
// Get the URI of the selected file // Get the URI of the selected file
val uri = data.data!! val uri = data.data!!
Logger.log.info("Importing uri = ${uri}") Logger.log.info("Starting import into ${info.uid} from file ${uri}")
try { try {
inputStream = activity!!.contentResolver.openInputStream(uri) inputStream = activity!!.contentResolver.openInputStream(uri)
@ -172,6 +173,8 @@ class ImportFragment : DialogFragment() {
fun loadFinished(data: ImportResult) { fun loadFinished(data: ImportResult) {
(activity as ResultFragment.OnImportCallback).onImportResult(data) (activity as ResultFragment.OnImportCallback).onImportResult(data)
Logger.log.info("Finished import")
dismissAllowingStateLoss() dismissAllowingStateLoss()
if (activity is Refreshable) { if (activity is Refreshable) {