WebSVN – Android Microlearning - Nuevo Interface – Diff – /app/src/main/java/com/cesams/twogetskills/activity/MainActivity.java

 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.ContentResolver;
 import android.content.DialogInterface;
+import android.content.PeriodicSync;
 import android.net.ConnectivityManager;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.text.TextUtils;
 import com.cesams.twogetskills.preference.Preference;
 import com.cesams.twogetskills.receiver.ConnectivityReceiver;
 import com.cesams.twogetskills.receiver.InternalReceiver;
 import com.cesams.twogetskills.room.ResultCount;
 import com.cesams.twogetskills.skeleton.IReloadData;
+import com.cesams.twogetskills.sync.WorkSync;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.google.android.material.navigation.NavigationBarView;
 import com.google.android.material.snackbar.Snackbar;
+import androidx.appcompat.widget.Toolbar;
+import androidx.work.Constraints;
+import androidx.work.ExistingPeriodicWorkPolicy;
+import androidx.work.NetworkType;
+import androidx.work.PeriodicWorkRequest;
+import androidx.work.WorkManager;
-import androidx.appcompat.widget.Toolbar;
+import androidx.work.WorkRequest;
 import com.cesams.twogetskills.Constants;
 import org.json.JSONException;
 import org.json.JSONObject;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
-import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Random;
+import java.util.TimeZone;
-import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
 //import de.hdodenhof.circleimageview.CircleImageView;
 import okhttp3.Call;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
+public class MainActivity extends  AppCompatActivity implements ITwoGetSkills {
-public class MainActivity extends  AppCompatActivity implements ITwoGetSkills {
+    /*
     private boolean isSyncDevice = false;
     private boolean isSyncToken = false;
+    private boolean isSyncBatch = false;
+    */
-    private boolean isSyncBatch = false;
+    private boolean isActiveOperation = false;
     private boolean isForeground = false;
     private boolean isSmartLockLoginRun = false;
     private boolean isShowingCartelRefresh = false;
     private boolean connected = false;
     private ConnectivityReceiver mConnectivityReceiver;
     private InternalReceiver mInternalReceiver;
     private ProgressBar mProgressBar;
     private Toolbar mToolbar;
-    private Account mAccount;
+    //private Account mAccount;
     private AppDatabase mAppDatabase;
+    private WorkManager mWorkManager;
     ActivityResultLauncher<Intent> mLauncher = registerForActivityResult(
             if (!TextUtils.isEmpty(preference.getDeviceToken())) {
                 Log.e("BUG Token", "SyncRecord - FCM1");
                 sync = new Sync(Constants.SYNC_ADAPTER_TYPE_FCM, preference.getDeviceToken());
+                mAppDatabase.getSyncDao().insert(sync);
-                mAppDatabase.getSyncDao().insert(sync);
+                registerDevice(sync);
+            }
+        }
         /**** CANAL DE NOTIFICACIONES **/
         createNotificationChannel();
        // badgenotification= findViewById(R.id.cart_badge);
                         CartelRefreshContent();
+                    }
+            }
+    }
+        Constraints constraints = new Constraints.Builder()
+                .setRequiredNetworkType(NetworkType.CONNECTED)
+                .build();
+        PeriodicWorkRequest mWorkRequestSync =
+                new PeriodicWorkRequest.Builder(WorkSync.class, 15, TimeUnit.MINUTES)
+                        // Constraints
+                        .build();
+        mWorkManager = WorkManager.getInstance(getApplication());
+        mWorkManager.enqueueUniquePeriodicWork(
+                WorkSync.class.getSimpleName(),
+                ExistingPeriodicWorkPolicy.KEEP, //Existing Periodic Work policy
+                mWorkRequestSync //work request
+        );
     }}
         if(!TextUtils.isEmpty(preference.getDeviceUuid())) {
             Log.e("BUG Token", "SyncRecord - FCM1");
             Sync sync = new Sync(Constants.SYNC_ADAPTER_TYPE_FCM, token);
+            mAppDatabase.getSyncDao().insert(sync);
-            mAppDatabase.getSyncDao().insert(sync);
+            registerFcm(sync);
+        }
+    }
     @Override
     public void changeTopicActive(String topicUuid)
-    {
-        Log.d(TAG, "changeTopicActive : " + topicUuid);
-       // Log.e("Guardo", "Topico en Main");
+    {
-        preference.setTopicUuidActive(topicUuid);
-       // preference.setCapsuleUuidActive("");
-        //setNoCapsuleActive();
+        preference.setSourceNavigation(Constants.SOURCE_NAVIGATION_MY_CAPSULES);        preference.setTopicUuidActive(topicUuid);
         preference.setSlideUuidActive("");
         preference.save();
         invokeFragment(Constants.IDX_FRAGMENT_CAPSULES);
+    }
-    @Override
-    public void changeCapsuleActiveSourceNavigationMyCapsules(String topicUuid, String capsuleUuid)
+    @Override
     public void changeCapsuleActiveSourceNavigationMyCapsules(String topicUuid, String capsuleUuid)
         Log.d(TAG, "changeCapsuleActiveSourceNavigationMyCapsules topicUuid : " + topicUuid + " capsuleUuid : " + capsuleUuid );
+                    }
+                }
+            }
+        }
-        requestExecuteSyncAdapter();
+        syncToServerOrCheckChanges();
+    }
     @Override
                 //Log.d("requestCheckChanges", "secret = " + secret);
+                FormBody.Builder formBodyCheckChangeBuilder = new FormBody.Builder();
+                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_FIELD_APPLICATION_ID, String.valueOf(Configuration.APPLICATION_ID));
-                FormBody.Builder formBodyCheckChangeBuilder = new FormBody.Builder();
+                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_FIELD_VARIANT_ID, String.valueOf(Configuration.VARIANT_ID));
-                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_DEVICE_UUID, preference.getDeviceUuid());
+                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_FIELD_DEVICE_UUID, preference.getDeviceUuid());
-                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_MAX_DATE_CHANGES, preference.getMaxDateChanges());
+                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_FIELD_MAX_DATE_CHANGES, preference.getMaxDateChanges());
-                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_IS_FOREGROUND, String.valueOf(isForeground ? 1 : 0));
+                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_FIELD_IS_FOREGROUND, String.valueOf(isForeground ? 1 : 0));
                 Http http = new Http(this.getCacheDir(), preference.getDeviceUuid(), secret, created, rand);
                 OkHttpClient client = http.getHttpClient(false);
-                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_MAX_IDS, String.valueOf(capsules.size()));
+                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_FIELD_MAX_IDS, String.valueOf(capsules.size()));
                 //formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_MAX_IDS, String.valueOf(0));
         } catch (JSONException e) {
             Log.d(TAG, e.getMessage());
+        }
+    }
     @Override
     public void requestExecuteSyncAdapter() {
+        // Pass the settings flags by inserting them in a bundle
-            // Pass the settings flags by inserting them in a bundle
-            Bundle settingsBundle = new Bundle();
-            settingsBundle.putBoolean(
-                    ContentResolver.SYNC_EXTRAS_MANUAL, true);
+        Log.d(TAG, "requestExecuteSyncAdapter");
-            settingsBundle.putBoolean(
-                    ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
         syncToServerOrCheckChanges();
             ContentResolver.requestSync(mAccount, Constants.AUTHORITY, settingsBundle);
+    }
     public AppDatabase getDatabase() {
         return mAppDatabase;
+    }
     @Override
-    public void syncToServerOrCheckChanges()
+    public void registerDevice(Sync record)
     {
-        if(TextUtils.isEmpty(preference.getDeviceUuid())) {
+        if(isActiveOperation) {
             return;
-        }
-        SyncDao syncDao = mAppDatabase.getSyncDao();
-        List<Sync> records = syncDao.selectBatch();
+        }
-        if(records.size() > 0) {
-            syncToServer(records);
-        } else {
-                long timeLast = 0;
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat(Constants.FORMAT_DATETIME_SERVICE);
-                if (!TextUtils.isEmpty(preference.getLastDataRefresh())) {
-                    try {
-                        timeLast = simpleDateFormat.parse(preference.getLastDataRefresh()).getTime();
-                    } catch (Exception e) {
-                    }
-                }
+        Log.d(TAG, "registerDevice");
+        try {
+            Http http = new Http(this.getCacheDir());
-                Calendar calendar = Calendar.getInstance();
+            OkHttpClient client = http.getHttpClient(false);
+            RequestBody formBody = new FormBody.Builder()
+                    .add(Constants.POST_DEVICE_FIELD_APPLICATION_ID,  String.valueOf(Configuration.APPLICATION_ID))
+                    .add(Constants.POST_DEVICE_FIELD_VARIANT_ID,  String.valueOf(Configuration.VARIANT_ID))
+                    .add(Constants.POST_DEVICE_FIELD_DEVICE_UUID, preference.getDeviceUuid())
+                    .add(Constants.POST_DEVICE_FIELD_MANUFACTURER, Build.MANUFACTURER)
+                    .add(Constants.POST_DEVICE_FIELD_BRAND, Build.BRAND)
-                long timeNow = calendar.getTime().getTime();
+                    .add(Constants.POST_DEVICE_FIELD_VERSION, Build.VERSION.RELEASE  + " " + Build.VERSION_CODES.class.getFields()[android.os.Build.VERSION.SDK_INT].getName())
-                if(timeNow > (timeLast + Constants.CHECK_CHANGES_TOKEN_INTERVAL)){
+                    .add(Constants.POST_DEVICE_FIELD_MODEL, Build.MODEL)
-                    //Procesamiento en caso que el token no este, check cada 15 minutos.
+                    .add(Constants.POST_DEVICE_FIELD_PLATFORM, "android")
-                    if(preference.isRefreshTokenIsRequired()) {
+                    .add(Constants.POST_DEVICE_FIELD_SYNC_ID, String.valueOf(record.getId()))
-                        FirebaseMessaging.getInstance().getToken().addOnCompleteListener(new OnCompleteListener<String>() {
+                    .build();
-                            @Override
-                            public void onComplete(@NonNull Task<String> task) {
+            Log.d(TAG, "URL = " + Configuration.URL_DEVICE);
+            Request request = new Request.Builder()
-                                if (!task.isSuccessful()) {
+                    .url(Configuration.URL_DEVICE)
+                    .post(formBody)
+                    .build();
-                                    Log.w(TAG, "Fetching FCM registration token failed", task.getException());
+            isActiveOperation = true;
+            Call call = client.newCall(request);
-                                    return;
+            call.enqueue(new okhttp3.Callback() {
-                                }
+                public void onResponse(Call call, Response response)
+                        throws IOException {
-                                // Get new FCM registration token
+                    Log.d(TAG, "Response Device :  " +  response.body().toString());
+                    isActiveOperation = false;
+                    processResponseSyncToServer(response.body().string(),"device");
+                }
+                public void onFailure(Call call, IOException e) {
+                    isActiveOperation = false;
+                    Log.d(TAG, "Error :  " +  e.getMessage());
+                }
-                                String token = task.getResult();
+            });
+        } catch (Exception e) {
+        }
+    }
-                                Log.e("BUG Token", "Token 3 :  " + token);
+    @Override
+    public void registerFcm(Sync record)
-                                createSyncRecordNewToken(token);
+    {
+        isActiveOperation = true;
-                                preference.setRefreshTokenIsRequired(false);
+        Log.d(TAG, "FCM");
-                                preference.save();
+        Log.e("Token a Sync",""+record.getData());
+        try {
+            Http http = new Http(this.getCacheDir());
+            OkHttpClient client = http.getHttpClient(false);
-                            }
+            RequestBody formBody = new FormBody.Builder()
+                    .add(Constants.POST_FCM_FIELD_APPLICATION_ID, String.valueOf(Configuration.APPLICATION_ID))
-                        });
+                    .add(Constants.POST_FCM_FIELD_VARIANT_ID, String.valueOf(Configuration.VARIANT_ID))
+                    .add(Constants.POST_FCM_FIELD_DEVICE_UUID,preference.getDeviceUuid())
+                    .add(Constants.POST_FCM_FIELD_TOKEN, record.getData())
+                    .add(Constants.POST_FCM_FIELD_SYNC_ID, String.valueOf(record.getId()))
-                    } else {
+                    .build();
-                        if (preference.getDeviceToken().isEmpty()) {
+            Log.d(TAG, "URL = " + Configuration.URL_FCM);
-                            FirebaseMessaging.getInstance().deleteToken().addOnCompleteListener(new OnCompleteListener<Void>() {
+            Request request = new Request.Builder()
-                                @Override
+                    .url(Configuration.URL_FCM)
+                    .post(formBody)
+                    .build();
+            Call call = client.newCall(request);
-                                public void onComplete(@NonNull Task<Void> task) {
+            call.enqueue(new okhttp3.Callback() {
-                                    preference.setRefreshTokenIsRequired(true);
+                public void onResponse(Call call, Response response)
-                                    preference.save();
+                        throws IOException {
+                    isActiveOperation = false;
-                                    Log.e("Esta vacio"," mando delete token");
+                    Log.e("Se envio", "Procesando respuesta");
+                    processResponseSyncToServer(response.body().string(),"");
+                }
+                public void onFailure(Call call, IOException e) {
+                    Log.d(TAG, "Error :  " +  e.getMessage());
+                    isActiveOperation = false;
+                }
+            });
+        } catch (Exception e) {
+        }
+    }
-                                }
-                            });
-                        }
-                    }
+    @Override
-                }
+    public void syncToServerOrCheckChanges()
-                 if (timeNow > (timeLast + Constants.CHECK_CHANGES_INTERVAL)) {
-                     //Solicitar revision de cambios cada 4 horas.
+    {
+        boolean otherOperationInProgress = false;
+        SyncDao syncDao = mAppDatabase.getSyncDao();
+        List<Sync> records = syncDao.selectBatch();
+        for(Sync record : records) {
+            if (record.getType() == Constants.SYNC_ADAPTER_TYPE_DEVICE) {
+                otherOperationInProgress = true;
+                registerDevice(record);
+                break;
+            } else if  (record.getType() == Constants.SYNC_ADAPTER_TYPE_FCM) {
-                    requestCheckChanges();
-                }
+                otherOperationInProgress = true;
+                registerFcm(record);
+                break;
+            }
+        }
-        }
+        if(otherOperationInProgress) {
-    }
+            return;
+        }
-    public void syncToServer(List<Sync> records)
-    {
-        int maxRecordsSyncBatch = 0;
-        FormBody.Builder formBodyBatchBuilder = new FormBody.Builder();
-        formBodyBatchBuilder.add(Constants.POST_SYNC_BATCH_FIELD_DEVICE_UUID, preference.getDeviceUuid());
-        for(Sync record : records)
-        {
-           // Log.e("Ingreso a", "syncToServer"+record.getType()+" data"+record.getData());
+        if(records.size() > 0) {
-          //  Log.d(TAG, "SyncRecord ID = " + record.getId() + " Data : "  + record.getData() + " Type= " + record.getType());
-            if(record.getType() == Constants.SYNC_ADAPTER_TYPE_DEVICE && !isSyncDevice) {
-                Log.d(TAG, "Device");
-                try {
+            syncToServer(records);
-                    Http http = new Http(this.getCacheDir());
+        } else {
-                    OkHttpClient client = http.getHttpClient(false);
+            long timeLast = 0;
-                    RequestBody formBody = new FormBody.Builder()
-                            .add(Constants.POST_DEVICE_FIELD_APPLICATION_ID,  String.valueOf(Configuration.APPLICATION_ID))
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat(Constants.FORMAT_DATETIME_SERVICE);
-                            .add(Constants.POST_DEVICE_FIELD_DEVICE_UUID, preference.getDeviceUuid())
+            if (!TextUtils.isEmpty(preference.getLastDataRefresh())) {
-                            .add(Constants.POST_DEVICE_FIELD_MANUFACTURER, Build.MANUFACTURER)
-                            .add(Constants.POST_DEVICE_FIELD_BRAND, Build.BRAND)
+                try {
-                            .add(Constants.POST_DEVICE_FIELD_VERSION, Build.VERSION.RELEASE  + " " + Build.VERSION_CODES.class.getFields()[android.os.Build.VERSION.SDK_INT].getName())
+                    timeLast = simpleDateFormat.parse(preference.getLastDataRefresh()).getTime();
-                            .add(Constants.POST_DEVICE_FIELD_MODEL, Build.MODEL)
+                } catch (Exception e) {
+                }
+            }
+            Calendar calendar = Calendar.getInstance();
+            long timeNow = calendar.getTime().getTime();
+            if(timeNow > (timeLast + Constants.CHECK_CHANGES_TOKEN_INTERVAL)){
+                if(preference.isRefreshTokenIsRequired()) {
+                    FirebaseMessaging.getInstance().getToken().addOnCompleteListener(new OnCompleteListener<String>() {
+                        @Override
+                        public void onComplete(@NonNull Task<String> task) {
-                            .add(Constants.POST_DEVICE_FIELD_PLATFORM, "android")
+                            if (!task.isSuccessful()) {
-                            .add(Constants.POST_DEVICE_FIELD_SYNC_ID, String.valueOf(record.getId()))
+                                Log.w(TAG, "Fetching FCM registration token failed", task.getException());
-                            .build();
+                                return;
+                            }
-                    Log.d(TAG, "URL = " + Configuration.URL_DEVICE);
-                    Request request = new Request.Builder()
+                            // Get new FCM registration token
+                            String token = task.getResult();
-                            .url(Configuration.URL_DEVICE)
-                            .post(formBody)
-                            .build();
-                    isSyncDevice = true;
-                    Call call = client.newCall(request);
-                    call.enqueue(new okhttp3.Callback() {
-                        public void onResponse(Call call, Response response)
-                                throws IOException {
-                            Log.d(TAG, "Response Device :  " +  response.body().toString());
-                            isSyncDevice = false;
-                            processResponseSyncToServer(response.body().string(),"device");
-                        }
-                        public void onFailure(Call call, IOException e) {
-                            isSyncDevice = false;
-                            Log.d(TAG, "Error :  " +  e.getMessage());
-                        }
-                    });
-                } catch (Exception e) {
-                }
-            }
-            if(record.getType() == Constants.SYNC_ADAPTER_TYPE_FCM && !isSyncToken && !isSyncDevice) {
+                            Log.e("BUG Token", "Token 3 :  " + token);
-                isSyncToken = true;
-                Log.d(TAG, "FCM");
+                            createSyncRecordNewToken(token);
-                Log.e("Token a Sync",""+record.getData());
+                            preference.setRefreshTokenIsRequired(false);
+                            preference.save();
+                        }
-                try {
-                    Http http = new Http(this.getCacheDir());
+                    });
-                    OkHttpClient client = http.getHttpClient(false);
+                } else {
                     if (preference.getDeviceToken().isEmpty()) {
-                    RequestBody formBody = new FormBody.Builder()
+                        FirebaseMessaging.getInstance().deleteToken().addOnCompleteListener(new OnCompleteListener<Void>() {
-                            .add(Constants.POST_FCM_FIELD_DEVICE_UUID,preference.getDeviceUuid())
+                            @Override
-                            .add(Constants.POST_FCM_FIELD_TOKEN, record.getData())
+                            public void onComplete(@NonNull Task<Void> task) {
-                            .add(Constants.POST_FCM_FIELD_SYNC_ID, String.valueOf(record.getId()))
+                                preference.setRefreshTokenIsRequired(true);
+                                preference.save();
+                                Log.e("Esta vacio"," mando delete token");
-                            .build();
+                            }
                         });
-                    Log.d(TAG, "URL = " + Configuration.URL_FCM);
+                    }
                     Request request = new Request.Builder()
                             .url(Configuration.URL_FCM)
                             .post(formBody)
+            if (timeNow > (timeLast + Constants.CHECK_CHANGES_INTERVAL)) {
+                requestCheckChanges();
                             .build();
+        }
                     Call call = client.newCall(request);
                     call.enqueue(new okhttp3.Callback() {
                     .build();
                 Call call = client.newCall(request);
                 call.enqueue(new okhttp3.Callback() {
                     public void onResponse(Call call, Response response) throws IOException {
-                        isSyncBatch = false;
+                        isActiveOperation = false;
                         processResponseServerBatch(response.body().string());
+                    }
                     public void onFailure(Call call, IOException e) {
                         Log.d(TAG, "Error :  " +  e.getMessage());
-                        isSyncBatch = false;
+                        isActiveOperation = false;
+                    }
                 if(jsonObjectData.has("sync_id")) {
                     sync_id = jsonObjectData.getLong("sync_id");
                 }
-                /*
+/*
                 if(jsonObjectData.has("message")) {
                     message = jsonObjectData.getString("message");
                 }*/
                 if(jsonObjectData.has("aes")) {
                     preference.setAes(jsonObjectData.getString("aes"));
-                    preference.save(this);
+                    preference.save();
                 }
-                if(jsonObjectData.has("password")) {
+                if(jsonObjectData.has("password")) {
                     preference.setPassword(jsonObjectData.getString("password"));
-                    preference.save(this);
+                    preference.save();
+                }
                 */
+            }

Proyectos de Subversion Android Microlearning - Nuevo Interface

(root)/app/src/main/java/com/cesams/twogetskills/activity/MainActivity.java – Rev 71 → 73