Changeset 3fe55cf in dispositivos_moviles for TibisayMovil/src
- Timestamp:
- Oct 23, 2013, 8:34:45 AM (11 years ago)
- Branches:
- master
- Children:
- 8243993
- Parents:
- f907928
- Location:
- TibisayMovil/src/ve/gob/cenditel/tibisaymovil
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
TibisayMovil/src/ve/gob/cenditel/tibisaymovil/CertificateRepositoryActivity.java
rf907928 r3fe55cf 10 10 import android.graphics.drawable.Drawable; 11 11 import android.os.Bundle; 12 <<<<<<< HEAD13 12 import android.util.SparseBooleanArray; 14 13 import android.view.LayoutInflater; 15 =======16 14 import android.util.Log; 17 >>>>>>> c2318907ec781e759fbf9e1a0e0d0eb01a54dd3618 15 import android.view.View; 19 16 import android.view.ViewGroup; … … 56 53 } 57 54 58 <<<<<<< HEAD59 55 //prepara el llavero 60 56 private void prepareKeyChain() { … … 76 72 77 73 78 =======79 74 //On click listener for button1 80 75 final OnClickListener mGlobal_OnClickListener = new OnClickListener() { … … 98 93 protected void onActivityResult(int requestCode, int resultCode, 99 94 Intent data) { 95 96 if (requestCode == ActivityResult.IMPORT_CERTIFICATE && resultCode == Activity.RESULT_OK) { 97 this.launchPasswordDialog(data); 98 } 100 99 if (resultCode == RESULT_OK) { 101 100 … … 105 104 } 106 105 } 107 108 >>>>>>> c2318907ec781e759fbf9e1a0e0d0eb01a54dd36109 106 110 107 … … 235 232 } 236 233 237 } 238 239 240 @Override 241 protected void onActivityResult(int requestCode, int resultCode, final Intent data) { 242 243 if (requestCode == ActivityResult.IMPORT_CERTIFICATE && resultCode == Activity.RESULT_OK) { 244 this.launchPasswordDialog(data); 245 } 246 } 247 248 234 } 249 235 250 236 private void launchPasswordDialog(final Intent data) { -
TibisayMovil/src/ve/gob/cenditel/tibisaymovil/TibisayMovilActivity.java
rf907928 r3fe55cf 98 98 99 99 100 // seleccion de gestionar certificados 101 <<<<<<< HEAD 102 if (function.equals(getString(R.string.certificados))){ 103 Toast.makeText(context, "Gestionar repositorio", duration).show(); 104 ======= 100 // seleccion de gestionar certificados 105 101 if (function.equals("Certificados")){ 106 102 Toast.makeText(context, "Gestionar repositorio", duration).show(); … … 108 104 certificate_dialog.show(); 109 105 /* 110 >>>>>>> c2318907ec781e759fbf9e1a0e0d0eb01a54dd36111 106 112 107 // Chequeo de version del API de Android para creacion de repositorio … … 259 254 return builder.create(); 260 255 } 261 <<<<<<< HEAD262 256 263 257 … … 267 261 startActivity(intent); 268 262 } 269 =======270 263 271 264 //Crea dialogo de opciones para compartir archivos … … 310 303 //Crea dialogo de opciones para gestionar certificados 311 304 public AlertDialog makeCertificateOptionsDialog() { 312 final String[] option = new String[] {getString(R.string.manage_personal_certificates), getString(R.string.manage_certificates_for_encryption) }; 305 ; 306 final String[] option; 307 if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH){ 308 option = new String[] {getString(R.string.manage_personal_certificates), getString( R.string.manage_certificates_for_encryption) }; 309 } else { 310 option = new String[] {getString(R.string.manage_personal_certificates) }; 311 } 312 313 313 ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, 314 314 android.R.layout.select_dialog_item, option); … … 319 319 320 320 public void onClick(DialogInterface dialog, int which) { 321 322 switch (which) { 323 case 0: // Certificados personales 324 Log.i("DEBUG", "antes de activity call"); 325 326 break; 327 case 1: // Certificados para cifrado 328 Toast.makeText(getApplicationContext(), "Lanzar certificados de destinatarios", Toast.LENGTH_SHORT).show(); 329 manageRecipientCertificates(); 330 break; 331 332 default: 333 break; 321 322 if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH){ 323 324 switch (which) { 325 case 0: // Certificados personales 326 testRepository(); 327 break; 328 case 1: // Certificados para cifrado 329 manageRecipientCertificates(); 330 break; 331 } 332 333 } else { 334 335 switch (which) { 336 case 0: // Certificados para cifrado 337 manageRecipientCertificates(); 338 break; 339 } 340 334 341 } 342 335 343 } 336 344 … … 340 348 } 341 349 342 >>>>>>> c2318907ec781e759fbf9e1a0e0d0eb01a54dd36343 350 }
Note: See TracChangeset
for help on using the changeset viewer.