Changeset 3fe55cf in dispositivos_moviles for TibisayMovil/src/ve/gob/cenditel/tibisaymovil/TibisayMovilActivity.java

Timestamp:

Oct 23, 2013, 8:34:45 AM (11 years ago)

Author:

Jose Ruiz <joseruiz@…>

Branches:

master

Children:

8243993

Parents:

f907928

Message:

Modificacion de menu de repositorio

File:

• TibisayMovil/src/ve/gob/cenditel/tibisaymovil/TibisayMovilActivity.java (modified) (7 diffs)

TibisayMovil/src/ve/gob/cenditel/tibisaymovil/TibisayMovilActivity.java

@@ -98 +98 @@
                                 
                                 
-                                // seleccion de gestionar certificados
-<<<<<<< HEAD
-                                if (function.equals(getString(R.string.certificados))){
-                                        Toast.makeText(context, "Gestionar repositorio", duration).show();                                      
-=======
+                                // seleccion de gestionar certificados  
                                 if (function.equals("Certificados")){
                                         Toast.makeText(context, "Gestionar repositorio", duration).show();
@@ -108 +104 @@
                                         certificate_dialog.show();
                                         /*
->>>>>>> c2318907ec781e759fbf9e1a0e0d0eb01a54dd36
                                         
                                         // Chequeo de version del API de Android para creacion de repositorio           
@@ -259 +254 @@
                 return builder.create();
         }
-<<<<<<< HEAD
 
         
@@ -267 +261 @@
                 startActivity(intent);
         }
-=======
         
         //Crea dialogo de opciones para compartir archivos
@@ -310 +303 @@
         //Crea dialogo de opciones para gestionar certificados
         public AlertDialog makeCertificateOptionsDialog() {
-                final String[] option = new String[] {getString(R.string.manage_personal_certificates), getString(R.string.manage_certificates_for_encryption) };
+;               
+                final String[] option;
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH){
+                        option = new String[] {getString(R.string.manage_personal_certificates), getString( R.string.manage_certificates_for_encryption) };
+                } else {
+                        option = new String[] {getString(R.string.manage_personal_certificates) };
+                }
+                
                 ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,
                         android.R.layout.select_dialog_item, option);
@@ -319 +319 @@
                 
                   public void onClick(DialogInterface dialog, int which) {
-                          
-                          switch (which) {
-                        case 0: // Certificados personales
-                                Log.i("DEBUG", "antes de activity call");
-                                
-                                break;
-                        case 1: // Certificados para cifrado
-                                Toast.makeText(getApplicationContext(), "Lanzar certificados de destinatarios", Toast.LENGTH_SHORT).show();
-                                manageRecipientCertificates();
-                                break;
-                                
-                        default:
-                                break;
+                        
+                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH){
+
+                                switch (which) {
+                                case 0: // Certificados personales
+                                        testRepository();
+                                        break;
+                                case 1: // Certificados para cifrado
+                                        manageRecipientCertificates();
+                                        break;
+                                }
+                                
+                        } else  {
+                                
+                                switch (which) {
+                                case 0: // Certificados para cifrado
+                                        manageRecipientCertificates();
+                                        break;
+                                }
+                                
                         }
+                        
                   }
                   
@@ -340 +348 @@
         }
         
->>>>>>> c2318907ec781e759fbf9e1a0e0d0eb01a54dd36
 }