From 991025d79c233b78ccae071c389e1cbd81f1a4fb Mon Sep 17 00:00:00 2001 From: Juan Miguel Boyero Corral Date: Wed, 4 Apr 2012 01:10:24 +0000 Subject: [PATCH] Added error handler for all modules git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@256 5bc14d19-1e4b-4ba2-aa50-860af135f48c --- .../src/es/ugr/swad/swadroid/modules/Courses.java | 8 ++++++++ SWADroid/src/es/ugr/swad/swadroid/modules/Login.java | 11 +++++++++++ .../src/es/ugr/swad/swadroid/modules/Messages.java | 9 ++++++++- SWADroid/src/es/ugr/swad/swadroid/modules/Module.java | 9 +++++++-- .../src/es/ugr/swad/swadroid/modules/tests/Tests.java | 7 +++++++ .../swadroid/modules/tests/TestsConfigDownload.java | 8 ++++++++ .../es/ugr/swad/swadroid/modules/tests/TestsMake.java | 7 +++++++ .../modules/tests/TestsQuestionsDownload.java | 8 ++++++++ 8 files changed, 64 insertions(+), 3 deletions(-) diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/Courses.java b/SWADroid/src/es/ugr/swad/swadroid/modules/Courses.java index 98252f33..7f15beb6 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/Courses.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/Courses.java @@ -171,4 +171,12 @@ public class Courses extends Module { protected void postConnect() { finish(); } + + /* (non-Javadoc) + * @see es.ugr.swad.swadroid.modules.Module#onError() + */ + @Override + protected void onError() { + + } } diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/Login.java b/SWADroid/src/es/ugr/swad/swadroid/modules/Login.java index 5891cbb5..a7c8b238 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/Login.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/Login.java @@ -150,8 +150,19 @@ public class Login extends Module { setResult(RESULT_OK); } + /* (non-Javadoc) + * @see es.ugr.swad.swadroid.modules.Module#postConnect() + */ @Override protected void postConnect() { finish(); } + + /* (non-Javadoc) + * @see es.ugr.swad.swadroid.modules.Module#onError() + */ + @Override + protected void onError() { + + } } diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/Messages.java b/SWADroid/src/es/ugr/swad/swadroid/modules/Messages.java index 5c9fec88..d1acd2bc 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/Messages.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/Messages.java @@ -233,5 +233,12 @@ public class Messages extends Module { finish(); } - + + /* (non-Javadoc) + * @see es.ugr.swad.swadroid.modules.Module#onError() + */ + @Override + protected void onError() { + + } } diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java b/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java index 7b52f8f8..0aa0877f 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java @@ -126,6 +126,11 @@ public abstract class Module extends MenuActivity { */ protected abstract void postConnect(); + /** + * Error handler + */ + protected abstract void onError(); + /** * Gets METHOD_NAME parameter. * @return METHOD_NAME parameter. @@ -573,7 +578,8 @@ public abstract class Module extends MenuActivity { errorMsg = e.getMessage(); } - //Request finalized with errors + //Request finalized with errors + onError(); error(errorMsg); /*if(isDebuggable) { e.printStackTrace(); @@ -581,7 +587,6 @@ public abstract class Module extends MenuActivity { Log.d(TAG, connection.requestDump.toString()); Log.d(TAG, connection.responseDump.toString()); }*/ - setResult(RESULT_CANCELED); } else { postConnect(); diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/Tests.java b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/Tests.java index 3082a174..45357330 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/Tests.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/Tests.java @@ -117,5 +117,12 @@ public class Tests extends Module { protected void postConnect() { } + + /* (non-Javadoc) + * @see es.ugr.swad.swadroid.modules.Module#onError() + */ + @Override + protected void onError() { + } } diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java index f44e1451..b4bd7294 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java @@ -266,4 +266,12 @@ public class TestsConfigDownload extends Module { finish(); } + + /* (non-Javadoc) + * @see es.ugr.swad.swadroid.modules.Module#onError() + */ + @Override + protected void onError() { + + } } diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java index ce44a955..84cae17d 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java @@ -761,5 +761,12 @@ public class TestsMake extends Module { protected void postConnect() { } + + /* (non-Javadoc) + * @see es.ugr.swad.swadroid.modules.Module#onError() + */ + @Override + protected void onError() { + } } diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsQuestionsDownload.java b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsQuestionsDownload.java index c4277f52..0689db6f 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsQuestionsDownload.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsQuestionsDownload.java @@ -247,4 +247,12 @@ public class TestsQuestionsDownload extends Module { Toast.makeText(this, R.string.questionsTestsDownloadSuccesfulMsg, Toast.LENGTH_LONG).show(); finish(); } + + /* (non-Javadoc) + * @see es.ugr.swad.swadroid.modules.Module#onError() + */ + @Override + protected void onError() { + + } }