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

Timestamp:

Oct 22, 2013, 3:53:16 PM (11 years ago)

Author:

Jose Ruiz <joseruiz@…>

Branches:

master

Children:

3fe55cf

Parents:

288126d (diff), c231890 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of https://tibisay.cenditel.gob.ve/trac/scm/git/dispositivos_moviles

Conflicts:

TibisayMovil/AndroidManifest?.xml
TibisayMovil?/gen/net/neiti/droidtext/R.java
TibisayMovil?/gen/ve/gob/cenditel/tibisaymovil/R.java
TibisayMovil?/src/ve/gob/cenditel/tibisaymovil/CertificateRepositoryActivity.java
TibisayMovil?/src/ve/gob/cenditel/tibisaymovil/TibisayMovilActivity.java

File:

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

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

@@ -57 +57 @@
                 final AlertDialog sign_dialog = makeSignatureOptionsDialog();
                 
+                //Crear dialogo de opciones para compartir archivo
+                final AlertDialog share_dialog = makeShareOptionsDialog();
                         
+                //Crear dialogo de opciones para compartir cifrar archivo
+                final AlertDialog certificate_dialog = makeCertificateOptionsDialog();
+
                 
                 listViewFunctions.setOnItemClickListener(new OnItemClickListener(){
@@ -86 +91 @@
                                 }
                                 
+                                // seleccion de cifrar
+                                if(function.equals(getString(R.string.cifrar))) {
+                                        Toast.makeText(context, "CIFRAR", duration).show();
+                                        encryptFile();
+                                }
+                                
+                                
                                 // seleccion de gestionar certificados
+<<<<<<< HEAD
                                 if (function.equals(getString(R.string.certificados))){
                                         Toast.makeText(context, "Gestionar repositorio", duration).show();                                      
+=======
+                                if (function.equals("Certificados")){
+                                        Toast.makeText(context, "Gestionar repositorio", duration).show();
+                                        
+                                        certificate_dialog.show();
+                                        /*
+>>>>>>> c2318907ec781e759fbf9e1a0e0d0eb01a54dd36
                                         
                                         // Chequeo de version del API de Android para creacion de repositorio           
@@ -102 +122 @@
                                         
                                         // lanzar activity de gestion de repositorio
-                                        testRepository();                                       
+                                        testRepository();
+                                        
+                                        */
+                                }
+                                
+                                // seleccion de compartir archivo
+                                if (function.equals(getString(R.string.compartir))){
+                                        Toast.makeText(context, "Compartir Archivo", duration).show();
+                                        share_dialog.show();
+                                
                                 }
                                 // seleccion de firmar
@@ -175 +204 @@
         }
         
+        // lanza activity para compartir un documento
+        private void shareFile(String path){
+                Intent intent = new Intent(this, FileToShareActivity.class);
+                
+                intent.putExtra("path", path);
+                
+                startActivity(intent);
+        }
+
+        // lanza activity para cifrar un documento
+        private void encryptFile(){
+                Intent intent = new Intent(this, FileToEncryptActivity.class);          
+                startActivity(intent);
+        }
+
+        // lanza la activity para gestionar los certificados de destinarios (cifrado)
+        private void manageRecipientCertificates() {
+                Intent intent = new Intent(this, EncryptionCertificatesActivity.class);         
+                startActivity(intent);
+        }
+        
+        
         //Crea dialogo de opciones para firma electronica
         public AlertDialog makeSignatureOptionsDialog() {
@@ -208 +259 @@
                 return builder.create();
         }
+<<<<<<< HEAD
 
         
@@ -215 +267 @@
                 startActivity(intent);
         }
+=======
+        
+        //Crea dialogo de opciones para compartir archivos
+        public AlertDialog makeShareOptionsDialog() {
+                final String[] option = new String[] {getString(R.string.share_pdf_signed), 
+                                getString(R.string.share_bdoc_downloaded), getString(R.string.share_extracted_file_from_bdoc), 
+                                getString(R.string.share_encrypted) };
+                ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,
+                        android.R.layout.select_dialog_item, option);
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                
+                builder.setTitle(getString(R.string.seleccione_opcion));
+                builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
+                
+                  public void onClick(DialogInterface dialog, int which) {
+                          
+                          switch (which) {
+                        case 0: // Archivo Firmado
+                                Log.i("DEBUG", "antes de activity call");
+                                shareFile("archivoFirmado");
+                                break;
+                        case 1: // Archivos BDOC Descargados
+                                shareFile("bdocDescargado");
+                                break;
+                        case 2: // Archivos extraídos de BDOC
+                                shareFile("extraidoDeBdoc");
+                                break;
+
+                        case 3: // Archivos cifrados
+                                shareFile("cifrado");
+                                break;
+                        default:
+                                break;
+                        }
+                  }
+                  
+                });     
+                
+                return builder.create();
+        }
+        
+        //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) };
+                ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,
+                        android.R.layout.select_dialog_item, option);
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                
+                builder.setTitle(getString(R.string.seleccione_opcion));
+                builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
+                
+                  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;
+                        }
+                  }
+                  
+                });     
+                
+                return builder.create();
+        }
+        
+>>>>>>> c2318907ec781e759fbf9e1a0e0d0eb01a54dd36
 }