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
0cb8b626
Commit
0cb8b626
authored
Sep 07, 2021
by
narinder Rana
Browse files
manage Files List before and after upload
parent
764a385c
Pipeline
#134250
failed with stage
in 7 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/foundation/e/drive/operations/UploadFileOperation.java
View file @
0cb8b626
...
...
@@ -25,6 +25,7 @@ import java.io.File;
import
java.util.ArrayList
;
import
foundation.e.drive.database.DbHelper
;
import
foundation.e.drive.models.SyncedFileState
;
import
foundation.e.drive.services.InitializerService
;
import
foundation.e.drive.utils.CommonUtils
;
/**
...
...
@@ -136,6 +137,17 @@ public class UploadFileOperation extends RemoteOperation implements ComparableOp
//if upload is a success
if
(
uploadResult
.
isSuccess
()
){
Log
.
e
(
TAG
,
"upload is success ........................."
+
file
.
getName
()
+
" "
+
file
.
getAbsolutePath
());
Log
.
e
(
TAG
,
"files size before remove ........................."
+
InitializerService
.
files
.
size
());
InitializerService
.
files
.
remove
(
file
);
Log
.
e
(
TAG
,
"files size after remove ........................."
+
InitializerService
.
files
.
size
());
Object
data
=
uploadResult
.
getSingleData
();
if
(
data
!=
null
){
mSyncedState
.
setLastETAG
((
String
)
data
);
...
...
app/src/main/java/foundation/e/drive/services/FileObserverService.java
View file @
0cb8b626
...
...
@@ -23,13 +23,15 @@ import java.util.List;
import
foundation.e.drive.utils.CommonUtils
;
import
foundation.e.drive.utils.RecursiveFileObserver
;
public
class
FileObserverService
extends
Service
{
private
final
static
String
TAG
=
FileObserverService
.
class
.
getSimpleName
();
RecursiveFileObserver
mFileObserver
=
null
;
private
int
observerFlag
=-
1
;
//List<SyncedFileState> syncedFileStatesList=new ArrayList<>();
List
<
File
>
files
=
new
ArrayList
<>();
@Override
public
int
onStartCommand
(
Intent
intent
,
int
flags
,
int
startId
)
{
...
...
@@ -81,7 +83,12 @@ public class FileObserverService extends Service {
// }
// }
// syncedFileStatesList.add(syncedFileStates);
files
.
add
(
file
);
if
(!
InitializerService
.
files
.
contains
(
file
)){
Log
.
e
(
TAG
,
"adding new file into files list "
+
file
.
getName
()
+
" .... "
+
file
.
getAbsolutePath
());
InitializerService
.
files
.
add
(
file
);
}
//Check internet
...
...
@@ -92,7 +99,6 @@ public class FileObserverService extends Service {
try
{
if
(
observerFlag
==
-
1
){
new
AsyncTaskRunner
().
execute
(
""
);
}
}
...
...
@@ -152,7 +158,7 @@ public class FileObserverService extends Service {
Bundle
mBundle
=
new
Bundle
();
mBundle
.
putBoolean
(
"isFileObserverService"
,
true
);
mBundle
.
putByteArray
(
"fileObserverObject"
,
CommonUtils
.
convertToBytes
(
new
foundation
.
e
.
drive
.
models
.
FileObserver
(
files
)));
//
mBundle.putByteArray("fileObserverObject", CommonUtils.convertToBytes(new foundation.e.drive.models.FileObserver(files)));
observersServiceIntent
.
putExtras
(
mBundle
);
startService
(
observersServiceIntent
);
}
catch
(
Exception
exception
){
...
...
app/src/main/java/foundation/e/drive/services/InitializerService.java
View file @
0cb8b626
...
...
@@ -62,6 +62,7 @@ public class InitializerService extends Service
private
int
restartFolderCreationCounter
=
0
;
private
ConnectivityReceiver
connectivityReceiver
;
public
static
List
<
File
>
files
=
new
ArrayList
<>();
// public static List<File> fileObserver=new ArrayList<>();
@Override
...
...
app/src/main/java/foundation/e/drive/services/ObserverService.java
View file @
0cb8b626
...
...
@@ -71,7 +71,7 @@ public class ObserverService extends Service implements OnRemoteOperationListene
private
Account
mAccount
;
private
HashMap
<
Integer
,
Parcelable
>
operationsForIntent
;
private
Boolean
isFileObserverService
=
false
;
private
foundation
.
e
.
drive
.
models
.
FileObserver
fileObserverObject
;
//
private foundation.e.drive.models.FileObserver fileObserverObject;
/* Lifecycle Methods */
@Override
...
...
@@ -89,7 +89,7 @@ public class ObserverService extends Service implements OnRemoteOperationListene
Bundle
bundle
=
intent
.
getExtras
();
if
(
null
!=
bundle
){
isFileObserverService
=
bundle
.
getBoolean
(
"isFileObserverService"
);
fileObserverObject
=
(
foundation
.
e
.
drive
.
models
.
FileObserver
)
CommonUtils
.
convertFromBytes
(
bundle
.
getByteArray
(
"fileObserverObject"
));
//
fileObserverObject = (foundation.e.drive.models.FileObserver)CommonUtils.convertFromBytes(bundle.getByteArray("fileObserverObject"));
}
}
catch
(
Exception
ex
){
ex
.
printStackTrace
();
...
...
@@ -253,20 +253,15 @@ public class ObserverService extends Service implements OnRemoteOperationListene
}
}
else
{
if
(
isFileObserverService
){
Log
.
e
(
"TAG"
,
"isFileObserverService................"
+
isFileObserverService
);
//mSyncedFolders we have here
//we can get getIdsFromFolderToScan
List
<
File
>
files
=
fileObserverObject
.
getFiles
();
// List<File> files = fileObserverObject.getFiles();
DbHelper
.
updateSyncedFolders
(
mSyncedFolders
,
this
);
//@ToDo: maybe do this when all contents will be synced.
List
<
SyncedFileState
>
syncedFileStates
=
DbHelper
.
getSyncedFileStatesByFolders
(
this
,
getIdsFromFolderToScan
());
if
(!
syncedFileStates
.
isEmpty
()
||
!
files
.
isEmpty
()
)
{
handleLocalFiles
(
files
,
syncedFileStates
);
if
(!
syncedFileStates
.
isEmpty
()
||
!
InitializerService
.
files
.
isEmpty
()
)
{
handleLocalFiles
(
InitializerService
.
files
,
syncedFileStates
);
}
// handleLocalFiles(fileObserverObject.getFiles(), fileObserverObject.getSyncedFileStatesList());
...
...
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