Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
e
os
eDrive
Commits
14b66f68
Commit
14b66f68
authored
Nov 23, 2019
by
vince-bourgmayer
Browse files
use ServiceExceptionHandler in Observer, OMS & Initializer
parent
4f395d94
Changes
4
Show whitespace changes
Inline
Side-by-side
app/src/main/java/foundation/e/drive/services/InitializerService.java
View file @
14b66f68
...
...
@@ -34,6 +34,8 @@ import foundation.e.drive.receivers.ScreenOffReceiver;
import
foundation.e.drive.utils.AppConstants
;
import
foundation.e.drive.utils.CommonUtils
;
import
foundation.e.drive.utils.JobUtils
;
import
foundation.e.drive.utils.ServiceExceptionHandler
;
import
static
com
.
owncloud
.
android
.
lib
.
resources
.
files
.
FileUtils
.
PATH_SEPARATOR
;
import
static
foundation
.
e
.
drive
.
utils
.
AppConstants
.
INITIALFOLDERS_NUMBER
;
import
static
foundation
.
e
.
drive
.
utils
.
AppConstants
.
MEDIA_SYNCABLE_CATEGORIES
;
...
...
@@ -63,6 +65,9 @@ public class InitializerService extends Service implements OnRemoteOperationList
@Override
public
int
onStartCommand
(
Intent
intent
,
int
flags
,
int
startId
)
{
Log
.
i
(
TAG
,
"onStartCommand(...)"
);
Thread
.
setDefaultUncaughtExceptionHandler
(
new
ServiceExceptionHandler
(
this
));
//Get account
SharedPreferences
prefs
=
this
.
getSharedPreferences
(
AppConstants
.
SHARED_PREFERENCE_NAME
,
Context
.
MODE_PRIVATE
);
...
...
app/src/main/java/foundation/e/drive/services/ObserverService.java
View file @
14b66f68
...
...
@@ -51,6 +51,7 @@ import static com.owncloud.android.lib.resources.files.FileUtils.PATH_SEPARATOR;
import
static
foundation
.
e
.
drive
.
utils
.
AppConstants
.
INITIALIZATION_HAS_BEEN_DONE
;
import
foundation.e.drive.utils.DavClientProvider
;
import
foundation.e.drive.utils.JobUtils
;
import
foundation.e.drive.utils.ServiceExceptionHandler
;
/**
* @author Vincent Bourgmayer
...
...
@@ -75,16 +76,12 @@ public class ObserverService extends Service implements OnRemoteOperationListene
this
.
mSyncedFolders
=
null
;
}
@Override
public
void
onCreate
()
{
Log
.
i
(
TAG
,
"onCreate()"
);
super
.
onCreate
();
}
@Override
public
int
onStartCommand
(
Intent
intent
,
int
flags
,
int
startId
)
{
Log
.
i
(
TAG
,
"onStartCommand("
+
startId
+
")"
);
Thread
.
setDefaultUncaughtExceptionHandler
(
new
ServiceExceptionHandler
(
this
));
SharedPreferences
prefs
=
this
.
getSharedPreferences
(
AppConstants
.
SHARED_PREFERENCE_NAME
,
Context
.
MODE_PRIVATE
);
String
accountName
=
prefs
.
getString
(
AccountManager
.
KEY_ACCOUNT_NAME
,
""
);
String
accountType
=
prefs
.
getString
(
AccountManager
.
KEY_ACCOUNT_TYPE
,
""
);
...
...
app/src/main/java/foundation/e/drive/services/OperationManagerService.java
View file @
14b66f68
...
...
@@ -40,6 +40,7 @@ import foundation.e.drive.operations.UploadFileOperation;
import
foundation.e.drive.utils.AppConstants
;
import
foundation.e.drive.utils.CommonUtils
;
import
foundation.e.drive.utils.DavClientProvider
;
import
foundation.e.drive.utils.ServiceExceptionHandler
;
/**
* @author Vincent Bourgmayer
...
...
@@ -239,6 +240,7 @@ public class OperationManagerService extends Service implements OnRemoteOperatio
@Override
public
int
onStartCommand
(
Intent
intent
,
int
flags
,
int
startId
)
{
Log
.
i
(
TAG
,
"onStartCommand()"
);
Thread
.
setDefaultUncaughtExceptionHandler
(
new
ServiceExceptionHandler
(
this
));
Bundle
extras
=
intent
.
getExtras
();
Log
.
d
(
TAG
,
"OperationManagerService recieved "
+(
extras
==
null
?
"null extras"
:
extras
.
size
()+
" operations to perform"
)
);
...
...
app/src/main/java/foundation/e/drive/utils/ServiceExceptionHandler.java
View file @
14b66f68
...
...
@@ -6,8 +6,8 @@
* http://www.gnu.org/licenses/gpl.html
*/
package
foundation.e.drive.utils
;
import
android.app.Service
;
import
android.os.Environment
;
import
android.util.Log
;
import
java.io.File
;
import
java.io.FileOutputStream
;
...
...
@@ -20,6 +20,14 @@ import java.lang.Thread.UncaughtExceptionHandler;
* @author Vincent Bourgmayer
*/
public
class
ServiceExceptionHandler
implements
UncaughtExceptionHandler
{
private
UncaughtExceptionHandler
defaultUEH
;
Service
service
;
public
ServiceExceptionHandler
(
Service
service
)
{
this
.
service
=
service
;
}
@Override
public
void
uncaughtException
(
Thread
t
,
Throwable
e
)
{
e
.
printStackTrace
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment