mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-11-28 11:29:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

more logging (#145)

Browse source
This commit is contained in:
korelstar 2016-10-24 12:21:02 +02:00 committed by Niedermann IT-Dienstleistungen
parent abf8dc4702
commit 5895dc113b
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteServerSyncHelper.java
View file

@ -172,6 +172,7 @@ public class NoteServerSyncHelper {
private final boolean onlyLocalChanges;
private final List<ICallback> callbacks = new ArrayList<>();
private NotesClient client;
private List<Throwable> exceptions = new ArrayList<>();
public SyncTask(boolean onlyLocalChanges) {
this.onlyLocalChanges = onlyLocalChanges;
@ -293,8 +294,12 @@ public class NoteServerSyncHelper {
}
status = LoginStatus.OK;
} catch (IOException e) {
Log.e(getClass().getSimpleName(), "Exception", e);
exceptions.add(e);
status = LoginStatus.CONNECTION_FAILED;
} catch (JSONException e) {
Log.e(getClass().getSimpleName(), "Exception", e);
exceptions.add(e);
status = LoginStatus.JSON_FAILED;
}
return status;
@ -305,6 +310,9 @@ public class NoteServerSyncHelper {
super.onPostExecute(status);
if (status!=LoginStatus.OK) {
Toast.makeText(appContext, appContext.getString(R.string.error_sync, appContext.getString(status.str)), Toast.LENGTH_LONG).show();
for (Throwable e : exceptions) {
Toast.makeText(appContext, e.getClass().getName() + ": " + e.getMessage(), Toast.LENGTH_LONG).show();
}
}
syncActive = false;
// notify callbacks

4
app/src/main/java/it/niedermann/owncloud/notes/util/NotesClientUtil.java
View file

@ -1,6 +1,7 @@
package it.niedermann.owncloud.notes.util;
import android.util.Base64;
import android.util.Log;
import org.json.JSONArray;
import org.json.JSONException;
@ -80,10 +81,13 @@ public class NotesClientUtil {
return LoginStatus.SERVER_FAILED;
}
} catch (MalformedURLException e) {
Log.e(NotesClientUtil.class.getSimpleName(), "Exception", e);
return LoginStatus.CONNECTION_FAILED;
} catch (IOException e) {
Log.e(NotesClientUtil.class.getSimpleName(), "Exception", e);
return LoginStatus.CONNECTION_FAILED;
} catch (JSONException e) {
Log.e(NotesClientUtil.class.getSimpleName(), "Exception", e);
return LoginStatus.JSON_FAILED;
}
}