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

 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.NotificationCompat;
-import androidx.core.content.ContextCompat;
-import androidx.core.view.GravityCompat;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.ContentResolver;
-import android.content.DialogInterface;
+import android.content.SharedPreferences;
 import android.net.ConnectivityManager;
+import android.os.Build;
-import android.os.Build;
+import android.os.Handler;
-import android.os.Handler;
+import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.content.Context;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import android.widget.Toast;
 import com.bumptech.glide.Glide;
 import com.cesams.twogetskills.entity.UserLog;
 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.viewdata.SlideRefreshUIViewData;
-import com.cesams.twogetskills.viewmodel.SlideRefreshUIViewModel;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.google.android.material.navigation.NavigationBarView;
 import com.google.android.material.snackbar.Snackbar;
-import com.google.android.material.navigation.NavigationView;
 import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.appcompat.widget.Toolbar;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.room.Database;
+import androidx.appcompat.widget.Toolbar;
 import com.cesams.twogetskills.Constants;
 import com.cesams.twogetskills.R;
-import com.cesams.twogetskills.fragment.IntroFragment;
-import com.cesams.twogetskills.fragment.SigninFragment;
+import com.cesams.twogetskills.fragment.IntroFragment;
-import com.cesams.twogetskills.skeleton.ITwoGetSkills;
+import com.cesams.twogetskills.fragment.SigninFragment;
-import com.google.firebase.messaging.FirebaseMessagingService;
+import com.cesams.twogetskills.skeleton.ITwoGetSkills;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
+import java.util.List;
-import java.util.List;
+import java.util.Observable;
     private ActionBarDrawerToggle mDrawerToggle;
     private ImageView navHeaderUserImage;
     private TextView navHeaderUserName;
     private TextView navHeaderUserEmail;
     private HashMap<String, Fragment> fragmentHashMap;
     private TextView textViewMessageNotConnection;
     BottomNavigationView mNavigationView;
     BottomNavigationView mNavigationView;
     private Preference preference;
     private boolean connected = false;
     private ConnectivityReceiver mConnectivityReceiver;
     private InternalReceiver mInternalReceiver;
-    private ProgressBar mProgressBar;
-    private Toolbar mToolbar;
+    private ProgressBar mProgressBar;
-    private Account mAccount;
+    private Toolbar mToolbar;
         Log.d(TAG, "MainActivity onCreate");
         mAppDatabase = DatabaseHelper.getInstance(getApplicationContext()).getAppDatabase();
         preference = Preference.getInstance(getApplicationContext());
+        preference.load();
+        //Comprobamos que las preferencias del servicio sean accesibles desde aqui
+        Log.e("TOKEN","this: "+preference.getDeviceToken());
+        Log.e("DEVICE","this: "+preference.getDeviceUuid());
+/*
+        if(!TextUtils.isEmpty(preference.getDeviceUuid())) {
+            String uuid = UniqueID.id(getApplicationContext());
+            preference.setDeviceUuid(uuid);
+            preference.save();
+            Sync sync = new Sync(Constants.SYNC_ADAPTER_TYPE_DEVICE, uuid);
+            mAppDatabase.getSyncDao().insert(sync);
+            if(!TextUtils.isEmpty(preference.getDeviceToken())) {
+                sync = new Sync(Constants.SYNC_ADAPTER_TYPE_FCM, preference.getDeviceToken());
+                mAppDatabase.getSyncDao().insert(sync);
+            }
+           // syncToServerOrCheckChanges();
+*/
         preference = Preference.getInstance(getApplicationContext());
-        preference.load();
+/*
         handler = new Handler();
         handler = new Handler();
         final Runnable r = new Runnable() {
-            public void run() {
+        final Runnable r = new Runnable() {
-                if(TextUtils.isEmpty(preference.getDeviceUuid())) {
+            public void run() {
                     //  Log.e("Encontre","vacio el preferencie"+preference.getDeviceUuid());
-                    String uuid = UniqueID.id(getApplicationContext());
+                if(TextUtils.isEmpty(preference.getDeviceUuid())) {
+                    String uuid = UniqueID.id(getApplicationContext());
                     preference.setDeviceUuid(uuid);
-                    Log.e("Device", "nuevo " + uuid);
-                    preference.save();
+                    preference.save();
+                    Sync sync = new Sync(Constants.SYNC_ADAPTER_TYPE_DEVICE, uuid);
                     mAppDatabase.getSyncDao().insert(sync);
-                    Sync sync = new Sync(Constants.SYNC_ADAPTER_TYPE_DEVICE, uuid);
+                    syncToServerOrCheckChanges();
                     mAppDatabase.getSyncDao().insert(sync);
-                }
                 if(TextUtils.isEmpty(preference.getDeviceToken())) {
-                    Log.e("Aun sin token "," vamos a esperar");
                     //Aun no hay token FCM, repito la comprobacion..
                     handler.postDelayed(this, 2000);
-                }
                 else
-                    Log.e("Ya tengo"," token");
+                else
-                    if(TextUtils.isEmpty(preference.getDeviceUuid())) {
-                        //  Log.e("Encontre","vacio el preferencie"+preference.getDeviceUuid());
+                {
-                        String uuid = UniqueID.id(getApplicationContext());
-                        preference.setDeviceUuid(uuid);
-                        Log.e("Device","nuevo "+uuid);
+                    //Ya tenemos token FCM, verificamos de nuevo si tenemos Device Uuid
-                        preference.save();
+                    if(TextUtils.isEmpty(preference.getDeviceUuid())) {
                         String uuid = UniqueID.id(getApplicationContext());
-                        Sync sync = new Sync(Constants.SYNC_ADAPTER_TYPE_DEVICE, uuid);
+                        preference.setDeviceUuid(uuid);
-                        mAppDatabase.getSyncDao().insert(sync);
+                        preference.save();
                         Log.e("Token a este", "punto: "+preference.getDeviceToken());
                         Sync sync = new Sync(Constants.SYNC_ADAPTER_TYPE_DEVICE, uuid);
                         mAppDatabase.getSyncDao().insert(sync);
-                    }
+                        handler.postDelayed(this,2000);
-                    else
+                    }
+                    else
+                    {
+                        if(isSyncDevice) {
                            Sync sync = new Sync(Constants.SYNC_ADAPTER_TYPE_FCM, preference.getDeviceToken());
-                        if(!TextUtils.isEmpty(preference.getDeviceToken()) && isSyncDevice) {
+                            mAppDatabase.getSyncDao().insert(sync);
-                           Sync sync = new Sync(Constants.SYNC_ADAPTER_TYPE_FCM, preference.getDeviceToken());
+                            syncToServerOrCheckChanges();
                             // Log.e("Intento","Sync token to server"+preference.getDeviceToken());
-                            mAppDatabase.getSyncDao().insert(sync);
+                        else
-                            syncToServerOrCheckChanges();
+                        {   //Tengo el FCM Token pero no se ha realizado el Sync del Device ID
+                            syncToServerOrCheckChanges();
                             handler.postDelayed(this, 2000);
                             Log.e("Tengo el FCM"," pero no he syn el device");
+                    }
-                    }
-                }
-            }
-        };
         handler.postDelayed(r, 2000);
+            }
-        /**** CANAL DE NOTIFICACIONES **/
+        };
         createNotificationChannel();
       //  navHeaderUserEmail =  header.findViewById(R.id.nav_header_user_email);
-        textViewMessageNotConnection = findViewById(R.id.main_activity_text_view_message_not_connection);
         textViewMessageNotConnection = findViewById(R.id.main_activity_text_view_message_not_connection);
         mConnectivityReceiver = new ConnectivityReceiver();
         registerReceiver(mConnectivityReceiver, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
         IntentFilter intentFilterInternal = new IntentFilter();
         intentFilterInternal.addAction(Constants.BROADCAST_TYPE_NOTIFICATION);
-        intentFilterInternal.addAction(Constants.BROADCAST_TYPE_TOKEN);
+       // intentFilterInternal.addAction(Constants.BROADCAST_TYPE_TOKEN);
+        intentFilterInternal.addAction(Constants.BROADCAST_TYPE_COMMAND);
+        intentFilterInternal.addAction(Constants.BROADCAST_TYPE_SYNC_TO_SERVER_OR_CHECK_CHANGES);
+        mInternalReceiver = new InternalReceiver();
-        intentFilterInternal.addAction(Constants.BROADCAST_TYPE_COMMAND);
+        //registerReceiver(mInternalReceiver, intentFilterInternal);
+        this.registerReceiver(mInternalReceiver, intentFilterInternal);
         intentFilterInternal.addAction(Constants.BROADCAST_TYPE_SYNC_TO_SERVER_OR_CHECK_CHANGES);
      //   FirebaseMessaging.getInstance().setAutoInitEnabled(true);
         mInternalReceiver = new InternalReceiver();
         registerReceiver(mInternalReceiver, intentFilterInternal);
     @Override
     public void createSyncRecordNewToken(String token)
+    {
         Log.e("Token", "Seteo en preferences el token FCM");
-       // preference.setDeviceToken (token);
+        preference.setDeviceToken (token);
-       // preference.save();
+        preference.save();
         if(!TextUtils.isEmpty(preference.getDeviceUuid())) {
             Log.e("Creacion"," del synctoken record");
            // Log.e("Ingreso a", "syncToServer"+record.getType()+" data"+record.getData());
           //  Log.d(TAG, "SyncRecord ID = " + record.getId() + " Data : "  + record.getData() + " Type= " + record.getType());
           //  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");
+            if(record.getType() == Constants.SYNC_ADAPTER_TYPE_DEVICE && !isSyncDevice) {
-                isSyncDevice = true;
+                Log.d(TAG, "Device");
                     Call call = client.newCall(request);
                     call.enqueue(new okhttp3.Callback() {
                         public void onResponse(Call call, Response response)
-                                throws IOException {
-                            isSyncDevice = false;
+                                throws IOException {
                             Log.d(TAG, "Response Device :  " +  response.body().toString());
-                            processResponseSyncToServer(response.body().string());
+                            processResponseSyncToServer(response.body().string(), "device");
+                        }
                     });
                 } catch (Exception e) {
+                }
+            }
-            if(record.getType() == Constants.SYNC_ADAPTER_TYPE_FCM && !isSyncToken) {
+            if(record.getType() == Constants.SYNC_ADAPTER_TYPE_FCM && !isSyncToken && isSyncDevice) {
                 isSyncToken = true;
                 Log.d(TAG, "FCM");
                 Log.e("Token a Sync",""+record.getData());
                     call.enqueue(new okhttp3.Callback() {
                         public void onResponse(Call call, Response response)
                                 throws IOException {
                             isSyncToken = false;
                             Log.e("Se envio", "Procesando respuesta");
-                            processResponseSyncToServer(response.body().string());
+                            processResponseSyncToServer(response.body().string(), "fcmtoken");
+                        }
                         public void onFailure(Call call, IOException e) {
                             Log.d(TAG, "Error :  " +  e.getMessage());
                 Call call = client.newCall(request);
                 call.enqueue(new okhttp3.Callback() {
                     public void onResponse(Call call, Response response) throws IOException {
                         isSyncBatch = false;
-                        processResponseServerBatch(response.body().string());
+                        processResponseServerBatch(response.body().string(),"");
+                    }
                     public void onFailure(Call call, IOException e) {
+        }
+    }
-    private void processResponseServerBatch(String dataString)
+    private void processResponseServerBatch(String dataString, String origen)
+    {
                     preference.setPassword(jsonObjectData.getString("password"));
                     preference.save(this);
+                }
                 */
+            }
-            Log.d(TAG, "SyncID = " + sync_id);
             if(success && sync_id > 0) {
                 Log.d(TAG, "DELETE SYNC RECORD : " + sync_id);
                 mAppDatabase.getSyncDao().remove(sync_id);
+                if(origen.equals("device"))
+                {
+                    Log.e("Sync","device exitoso, ahora sigo con TokenFCM");
+                    isSyncDevice=true;
+                    syncToServerOrCheckChanges();
+                }
+                if(origen.equals("fcmtoken")){
+                    Log.e("Token", "termino de sync con exito");
+                }
+            }
         } catch (JSONException e) {
             e.printStackTrace();
+        }
+    }
-    private void processResponseSyncToServer(String dataString)
+    private void processResponseSyncToServer(String dataString, String origen)
+    {
         boolean success = false;
         long sync_id = 0;
         Log.d(TAG, "processResponseServer = " + dataString);
         try {
             JSONObject objJSON = new JSONObject(dataString);
             success = objJSON.has("success") ? objJSON.getBoolean("success")  : false;
+            if(success  && objJSON.has("data")) {
+                JSONObject jsonObjectData = objJSON.getJSONObject("data");
+                if(origen.equals("device"))
+                {
+                    Log.e("El origen","De la peticion es el dispositivo");
-            if(success  && objJSON.has("data")) {
+                    isSyncDevice=true;
                 JSONObject jsonObjectData = objJSON.getJSONObject("data");

Proyectos de Subversion Android Microlearning - Nuevo Interface

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