diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ba265a284592e3672280c4bdf7c0aa14a25109d..1e1f9bc24082959028072915af7e5891b41b35ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "registry.gitlab.e.foundation:5000/e/apps/docker-android-apps-cicd:latest" +image: "registry.gitlab.e.foundation:5000/e/apps/docker-android-apps-cicd:legacy" stages: - build diff --git a/app/src/main/java/foundation/e/drive/receivers/ConnectivityReceiver.java b/app/src/main/java/foundation/e/drive/receivers/ConnectivityReceiver.java index 066582a49dd363e5d4c5a2b323b8eb64690d9c93..22cd68edb0955896f7a4b1c080daf0abe700e5c8 100644 --- a/app/src/main/java/foundation/e/drive/receivers/ConnectivityReceiver.java +++ b/app/src/main/java/foundation/e/drive/receivers/ConnectivityReceiver.java @@ -9,11 +9,13 @@ import android.util.Log; import java.io.IOException; +import foundation.e.drive.services.InitializerService; + public class ConnectivityReceiver extends BroadcastReceiver { public static ConnectivityReceiverListener connectivityReceiverListener; - + final private String TAG = InitializerService.class.getSimpleName(); public ConnectivityReceiver() { super(); } @@ -42,7 +44,7 @@ public class ConnectivityReceiver && activeNetwork.isConnectedOrConnecting(); //if (connectivityReceiverListener != null) { - Log.e("TAG", "ConnectivityReceiver onNetworkConnectionChanged...." + isConnected); + Log.e(TAG, "ConnectivityReceiver onNetworkConnectionChanged...." + isConnected); //connectivityReceiverListener.onNetworkConnectionChanged(isConnected); //} } 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 ad556cea4a7b16a8c9aef74026eba249ed2ae874..36a1256cca6647e9a866e769e1f0ef64c7f9daf7 100644 --- a/app/src/main/java/foundation/e/drive/services/InitializerService.java +++ b/app/src/main/java/foundation/e/drive/services/InitializerService.java @@ -343,7 +343,7 @@ public class InitializerService extends Service public void onNetworkConnectionChanged(boolean isConnected) { //just for testing code for now - Log.e("TAG", "onNetworkConnectionChanged...." + isConnected); + Log.e(TAG, "onNetworkConnectionChanged...." + isConnected); } } \ No newline at end of file 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 213b1e9ff70b78edde1c947021ebc21c79e94211..a33855fab8d86505128ebd34b4273c05cd63d082 100644 --- a/app/src/main/java/foundation/e/drive/utils/JobUtils.java +++ b/app/src/main/java/foundation/e/drive/utils/JobUtils.java @@ -32,23 +32,23 @@ public abstract class JobUtils { */ public static void scheduleScannerJob(Context context){ Log.i(TAG, "scheduleJob"); - Log.i(TAG, "scheduleJob task off"); + /* 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 -// .setPersisted(true) -// .setRequiredNetworkType( JobInfo.NETWORK_TYPE_ANY ) -// .build(); -// -// JobScheduler jobScheduler = context.getSystemService( JobScheduler.class ); -// -// if ( jobScheduler.schedule( job ) == JobScheduler.RESULT_SUCCESS ) { -// Log.d(TAG, "Scheduled job created"); -// } else { -// Log.e(TAG, "Scheduled job not created"); -// } + ComponentName jobService = new ComponentName( context, ScannerJob.class ); + + JobInfo job = new JobInfo.Builder(ScannerJobId, jobService ) + .setPeriodic(7200000 , 30000) //2 hr + .setPersisted(true) + .setRequiredNetworkType( JobInfo.NETWORK_TYPE_ANY ) + .build(); + + JobScheduler jobScheduler = context.getSystemService( JobScheduler.class ); + + if ( jobScheduler.schedule( job ) == JobScheduler.RESULT_SUCCESS ) { + Log.d(TAG, "Scheduled job created"); + } else { + Log.e(TAG, "Scheduled job not created"); + } } /**