Changeset c14b8d2 in dispositivos_moviles for TibisayMovil/src/ve/gob

Timestamp:

Nov 1, 2013, 10:34:18 AM (11 years ago)

Author:

Antonio Araujo Brett <aaraujo@…>

Branches:

master

Children:

58c7f6a

Parents:

f32914c

Message:

*- Modificaciones en actividad para ejecutar cifrado de un archivo a través de una tarea asíncrona (AsyncTask?). Se muestra un diálogo de progreso durante el proceso de cifrado.

Location:

TibisayMovil/src/ve/gob/cenditel/tibisaymovil

Files:

• PDFVerifyResultActivity.java (modified) (1 diff)
• PKCS12ToDecryptActivity.java (modified) (1 diff)
• SelectCertificateToEncryptActivity.java (modified) (6 diffs)

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

@@ -55 +55 @@
     private LinearLayout button_finish;
 
- // ruta absoluta al archivo a verificar
+    // ruta absoluta al archivo a verificar
     private String pdfToVerify;
         

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

@@ -679 +679 @@
                      pkcs12Password = password.getText().toString();
                      if (!pkcs12Password.isEmpty()){
-                         Toast.makeText(PKCS12ToDecryptActivity.this,"PKCS12 Password : "+ password.getText().toString(), Toast.LENGTH_LONG).show();
+                         //Toast.makeText(PKCS12ToDecryptActivity.this,"PKCS12 Password : "+ password.getText().toString(), Toast.LENGTH_LONG).show();
                          
                          password.setText("");

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

@@ -14 +14 @@
 import ee.sk.xmlenc.EncryptedData;
 import ee.sk.xmlenc.EncryptedKey;
-
 import ve.gob.cenditel.tibisaymovil.R;
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -23 +23 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.Looper;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -495 +497 @@
      */
         // funcion para desplegar el gestor de certificados de destinatarios para cifrar
-        private void encryptFile(String fileToEncrypt, String certificateToEncrypt) {
+        private void encryptFile(final String fileToEncrypt, final String certificateToEncrypt) {
                 
                 Toast.makeText(getApplicationContext(), "Encrypting file: " + fileToEncrypt, Toast.LENGTH_SHORT).show();
-        
-                // TODO chequear que se pueda escribir en el directorio /mnt/sdcard/TibisayMovil/EncryptedFiles
+                
+                
                 // chequear disponibilidad de directorio de certificados
             if (!checkCertificatesDirectoryAvailability()){
@@ -508 +510 @@
             }
                 
-                
+                // ********************* prueba de AsyncTask ******************************
+                
+                AsyncTask<Void, Void, ArrayList<String>> task = new AsyncTask<Void, Void, ArrayList<String>>() {
+
+            private ProgressDialog pd;
+
+            @Override
+            protected void onPreExecute() {
+
+                     pd = new ProgressDialog(SelectCertificateToEncryptActivity.this);  
+                     pd.setTitle("Cifrando archivo");   
+                     pd.setMessage(getString(R.string.por_favor_epsere));       
+                     pd.setCancelable(false);   
+                     pd.setIndeterminate(true); 
+                     pd.show();
+
+            }
+
+            @Override
+            protected ArrayList<String> doInBackground(Void... arg0) {
+            
+                /*
+                try {
+                    Thread.sleep(3000);
+                } catch(InterruptedException ex) {
+                    Thread.currentThread().interrupt();
+                }
+                */
+                
+                // para solventar error:
+                // Can't create handler inside thread that has not called Looper.prepare()
+                Looper.prepare();
+                
+                // arreglo para almacenar resultado de la operacion
+                ArrayList<String> resultArray = new ArrayList<String>();
+                resultArray.clear();
+                
+                
+                ConfigManager.init("jar://jdigidoc.cfg");
+                        Log.d("despues de:", "ConfigManager.init");
+                
+                // signed doc object if used 
+                SignedDoc m_sdoc;
+                m_sdoc = null;
+
+                // encrypted data object if used 
+                EncryptedData m_cdoc;
+                m_cdoc = null;
+                
+                String inFile = null, outFile = null;
+                String certFile = null;
+                String recipient = null;
+                String keyName = null;
+                String carriedKeyName = null;
+                String sId = null;      
+                        
+                inFile = fileToEncrypt;
+                certFile = certificateToEncrypt;
+                
+                // agregar el destinatario
+                try {
+
+                        if (m_cdoc == null){
+                                Log.d("m_cdoc == null", "-");
+                                m_cdoc = new EncryptedData(null, null, null, EncryptedData.DENC_XMLNS_XMLENC, EncryptedData.DENC_ENC_METHOD_AES128);
+                        }
+                        Log.d("Adding recipient", certFile);
+                        X509Certificate recvCert = SignedDoc.readCertificate(new File(certFile));
+                        if (recvCert != null && recipient == null)
+                                recipient = SignedDoc.getCommonName(recvCert.getSubjectDN().getName());
+                        Log.d("Recipient", recipient);
+                        if (sId == null){
+                                int n = m_cdoc.getNumKeys() + 1;
+                                sId = "ID" + n;
+                                
+                        }
+                        
+                        EncryptedKey ekey = new EncryptedKey(sId, recipient, EncryptedData.DENC_ENC_METHOD_RSA1_5, keyName, carriedKeyName, recvCert);
+                        m_cdoc.addEncryptedKey(ekey);
+
+                        
+                }catch(Exception e){
+                        Log.d("Error adding EncryptedKey: ", e.getMessage());
+                        Toast.makeText(getApplicationContext(), e.getMessage(), Toast.LENGTH_SHORT).show();
+                        
+                        //showDialog(getResources().getString(R.string.msg_encryption_error), e.getMessage());
+                        //return;
+                        
+                        resultArray.add("false");
+                                resultArray.add(getResources().getString(R.string.msg_encryption_error));
+                                resultArray.add(e.getMessage());
+                                return resultArray;
+                }
+                
+                // ejecutar el cifrado
+                try {
+
+                        Log.d("Encrypting file:", inFile + " to: " + outFile);
+                        File fIn = new File(inFile);
+                        // create a ddoc intermediate file
+                        m_sdoc = new SignedDoc(SignedDoc.FORMAT_DIGIDOC_XML, SignedDoc.VERSION_1_3);
+                        
+                        Log.d("Encrypting file:", "paso new SignedDoc");
+                        
+                        DataFile df = m_sdoc.addDataFile(new File(inFile), SignedDoc.xmlns_digidoc13, DataFile.CONTENT_EMBEDDED_BASE64);
+                                        
+                        Log.d("Encrypting file:", "paso addDataFile");
+                        
+                        
+                        byte[] data = SignedDoc.readFile(new File(inFile));
+                        
+                        Log.d("Encrypting file:", "paso readFile");
+                        
+                        df.setBase64Body(data);
+                        
+                        Log.d("Encrypting file:", "paso setBase64Body");
+                        
+                        byte[] inData = m_sdoc.toXML().getBytes("UTF-8");
+                        
+                        Log.d("Encrypting file:", "paso toXML()");
+                        
+                        Log.d("Encrypting file", "Content: " + inFile + " size: " + data.length);
+                        Log.d("Encrypting file", "DF: " + new String(inData));
+                        
+                        m_cdoc.setData(inData);
+                        m_cdoc.setDataStatus(EncryptedData.DENC_DATA_STATUS_UNENCRYPTED_AND_NOT_COMPRESSED);
+                        m_cdoc.addProperty(EncryptedData.ENCPROP_FILENAME, inFile + ".ddoc");
+                        m_cdoc.setMimeType(EncryptedData.DENC_ENCDATA_TYPE_DDOC);
+                        StringBuffer sb = new StringBuffer();
+                        sb.append(fIn.getName());
+                        sb.append("|");
+                        sb.append(new Long(fIn.length()).toString() + " B|");
+                        sb.append("application/unknown|");
+                        sb.append("/" + fIn.getName());
+                        m_cdoc.addProperty(EncryptedData.ENCPROP_ORIG_FILE, sb.toString());
+                        //m_cdoc.addProperty(EncryptedData.ENCPROP_ORIG_SIZE, new Long(inData.length).toString());
+                        
+                        int nCompressOption = 0;
+                        
+                        m_cdoc.encrypt(nCompressOption);
+                                        
+                        // genera el archivo cifrado en /data/data/ve.gob.cenditel/files
+                        //FileOutputStream fos = openFileOutput(outFile, Context.MODE_WORLD_WRITEABLE);
+                        
+                        outFile = encrypted_dir_files + fIn.getName()+".cdoc";
+                        Toast.makeText(getApplicationContext(), "outFile: " + outFile, Toast.LENGTH_SHORT).show();
+                        
+                        
+                        FileOutputStream fos = new FileOutputStream( outFile );
+                        
+                        Log.d("Encrypting file", "antes de escribir archivo " + outFile);
+                        
+                        fos.write(m_cdoc.toXML());
+                        
+                        Log.d("Encrypting file", "despues de escribir archivo " + outFile);
+                        
+                        fos.close();
+                        
+                        Log.d("Encrypting file", "despues de cerrar archivo " + outFile);
+                        
+                        Toast.makeText(getApplicationContext(), "Cifrado correctamente: " + outFile, Toast.LENGTH_SHORT).show();
+                        
+                        // lanzar la actividad para mostrar el resultado del cifrado
+                        //showEncryptionResults(fileToEncrypt, outFile, recipient);             
+                        resultArray.add("true"); // [0]
+                        resultArray.add(outFile); // [1]
+                        resultArray.add(recipient); // [2]
+
+
+                } catch(Exception e) {
+                        Log.d("Error encrypting file: ", inFile + " - " + e.getMessage());
+                        e.printStackTrace(System.err);
+                        Toast.makeText(getApplicationContext(), e.getMessage(), Toast.LENGTH_SHORT).show();
+                        
+                        //showDialog(getResources().getString(R.string.msg_encryption_error), e.getMessage());
+                        //return;
+                        
+                        resultArray.add("false");
+                                resultArray.add(getResources().getString(R.string.msg_encryption_error));
+                                resultArray.add(e.getMessage());
+                                return resultArray;
+                        
+                }               
+                
+                return resultArray;
+            }
+            
+            @Override
+            protected void onPostExecute(ArrayList<String> result) {
+                 
+                
+                        if (result.get(0).equals("false")){
+                                showDialog(result.get(1), result.get(2));
+                        }else{
+                                //showDialog(result.get(1), result.get(2), true);
+                                showEncryptionResults(fileToEncrypt, result.get(1), result.get(2));
+                        }
+                                
+                pd.dismiss();
+            }
+                        
+                };
+                
+                task.execute((Void[])null);
+                
+                // ********************* fin prueba de AsyncTask ******************************
+        
+/*              
         ConfigManager.init("jar://jdigidoc.cfg");
                 Log.d("despues de:", "ConfigManager.init");
         
-        /** signed doc object if used */
+        // signed doc object if used 
         SignedDoc m_sdoc;
         m_sdoc = null;
 
-        /** encrypted data object if used */
+        // encrypted data object if used 
         EncryptedData m_cdoc;
         m_cdoc = null;
@@ -640 +849 @@
         // lanzar la actividad para mostrar el resultado del cifrado
         showEncryptionResults(fileToEncrypt, outFile, recipient);
-        
+*/      
         
                 
@@ -775 +984 @@
                 });
                 
-                // 3. Get the AlertDialog from create()                         
+                // 3. Get the AlertDialog from create()
                 AlertDialog dialog = builder.create();
                 dialog.show();