From 0dbadcd3f29f9191121405e89925c79b8b5d4ba3 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 10 Feb 2021 17:05:34 +0530 Subject: [PATCH] handling and tracking with logs --- .../foundation/e/drive/database/DbHelper.java | 2 ++ .../e/drive/services/InitializerService.java | 5 +++ .../e/drive/services/ObserverService.java | 33 +++++++++++-------- .../foundation/e/drive/utils/JobUtils.java | 4 +-- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/foundation/e/drive/database/DbHelper.java b/app/src/main/java/foundation/e/drive/database/DbHelper.java index d1f94ee7..a5f4b078 100644 --- a/app/src/main/java/foundation/e/drive/database/DbHelper.java +++ b/app/src/main/java/foundation/e/drive/database/DbHelper.java @@ -218,11 +218,13 @@ public final class DbHelper extends SQLiteOpenHelper { */ public static long insertSyncedFolder(SyncedFolder mSyncedFolder, Context context){ SyncedFolderDAO dao = openSyncedFolderDAO(context, true); + Log.e(TAG, "InsertSyncedFolder :: "+mSyncedFolder.getLocalFolder()); if(dao == null){ Log.d(TAG+"_insertSyncedFolder", "dao is null"); return -2; } long id = dao.insert(mSyncedFolder); + Log.e(TAG, "InsertSyncedFolder ID:: "+id); dao.close(); return id; } diff --git a/app/src/main/java/foundation/e/drive/services/InitializerService.java b/app/src/main/java/foundation/e/drive/services/InitializerService.java index 607edf9d..b6bffc80 100644 --- a/app/src/main/java/foundation/e/drive/services/InitializerService.java +++ b/app/src/main/java/foundation/e/drive/services/InitializerService.java @@ -153,7 +153,12 @@ public class InitializerService extends Service implements OnRemoteOperationList for(int i=-1, size = categories.size(); ++i < size;){ final String DEVICE_SPECIFIC_PATH = PATH_SEPARATOR+"Devices"+PATH_SEPARATOR+ Build.BRAND+"_"+ Build.MODEL+"_" + Build.SERIAL; + + Log.e(TAG, "test categories :: "+ categories.get(i)); + Log.e(TAG, "test getExternalFolder :: "+ getExternalFolder(Environment.DIRECTORY_DCIM)); + switch ( categories.get(i) ){ + case "Medias": break; case "Images": diff --git a/app/src/main/java/foundation/e/drive/services/ObserverService.java b/app/src/main/java/foundation/e/drive/services/ObserverService.java index 0cadf83c..c10552bf 100644 --- a/app/src/main/java/foundation/e/drive/services/ObserverService.java +++ b/app/src/main/java/foundation/e/drive/services/ObserverService.java @@ -80,7 +80,7 @@ public class ObserverService extends Service implements OnRemoteOperationListene @Override public int onStartCommand(Intent intent, int flags, int startId) { - Log.i(TAG, "onStartCommand("+startId+")"); + Log.e(TAG, "onStartCommand("+startId+")"); CommonUtils.setServiceUnCaughtExceptionHandler(this); @@ -130,7 +130,7 @@ public class ObserverService extends Service implements OnRemoteOperationListene //if time diff between current sync and last sync is higher or equal to delay minimum between two sync if( (currentTime - lastSyncTime ) < INTERSYNC_MINIMUM_DELAY ){ Log.w(TAG, "Delay between now and last call is too short"); - return super.onStartCommand( intent, flags, startId ); + // return super.onStartCommand( intent, flags, startId ); } //check for the case where intent has been launched by initializerService @@ -185,20 +185,25 @@ public class ObserverService extends Service implements OnRemoteOperationListene */ private void clearCachedFile(){ Log.i(TAG, "clearCachedFile()"); - //Load subfiles into external cache file - File[] fileArray = this.getApplicationContext().getExternalCacheDir().listFiles(new OnlyFileFilter() ); - if(fileArray != null) { - boolean toRemove; - for (int i = -1, size = fileArray.length; ++i < size; ) { - toRemove = true; - if (toRemove) { - boolean deleteResult = fileArray[i].delete(); - Log.v(TAG+"_handleCachedFile()", "Deletion of cached file: " + deleteResult); + try{ + //Load subfiles into external cache file + File[] fileArray = this.getApplicationContext().getExternalCacheDir().listFiles(new OnlyFileFilter() ); + if(fileArray != null) { + boolean toRemove; + for (int i = -1, size = fileArray.length; ++i < size; ) { + toRemove = true; + if (toRemove) { + boolean deleteResult = fileArray[i].delete(); + Log.v(TAG+"_handleCachedFile()", "Deletion of cached file: " + deleteResult); + } } + }else{ + Log.e(TAG+"_handleCachedFile()", "Array of cached file is null"); } - }else{ - Log.e(TAG+"_handleCachedFile()", "Array of cached file is null"); + }catch (Exception ex){ + ex.printStackTrace(); } + } /** @@ -208,7 +213,7 @@ public class ObserverService extends Service implements OnRemoteOperationListene **/ private void startScan(boolean remote) { - Log.i(TAG, "startScan("+remote+")"); + Log.e(TAG, "startScan("+remote+")"); this.mSyncedFolders = loadSyncedFolders(); if(mSyncedFolders.isEmpty() ){ diff --git a/app/src/main/java/foundation/e/drive/utils/JobUtils.java b/app/src/main/java/foundation/e/drive/utils/JobUtils.java index 790427eb..2008d86e 100644 --- a/app/src/main/java/foundation/e/drive/utils/JobUtils.java +++ b/app/src/main/java/foundation/e/drive/utils/JobUtils.java @@ -31,12 +31,12 @@ public abstract class JobUtils { * @param context app or service context */ public static void scheduleScannerJob(Context context){ - Log.i(TAG, "scheduleJob"); + Log.e(TAG, "scheduleJob"); /* I. Start periodic checkup */ ComponentName jobService = new ComponentName( context, ScannerJob.class ); JobInfo job = new JobInfo.Builder(ScannerJobId, jobService ) - .setPeriodic(1860000, 30000) //31git minutes and 30 secondes + .setPeriodic(1*1000) //31git minutes and 30 secondes .setPersisted(true) .setRequiredNetworkType( JobInfo.NETWORK_TYPE_ANY ) .build(); -- GitLab