Changeset 1a56d4c in dispositivos_moviles for TibisayMovil/src/ve/gob/cenditel

Timestamp:

Jul 16, 2013, 10:59:46 AM (11 years ago)

Author:

Jose Ruiz <joseruiz@…>

Branches:

master

Children:

37467be

Parents:

08c45bd (diff), 09c6eb7 (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

Location:

TibisayMovil/src/ve/gob/cenditel/tibisaymovil

Files:

• CertificateRepositoryActivity.java (added)
• FileAlreadyExistsException.java (added)
• FsUtils.java (added)
• FunctionListAdapter.java (modified) (3 diffs)
• OutOfSpaceError.java (added)
• PKCS12FilePickerActivity.java (added)
• TibisayMovilActivity.java (modified) (5 diffs)

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

@@ -7 +7 @@
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -30 +31 @@
  
                 View rowView = inflater.inflate(R.layout.list_item, parent, false);
-                TextView textView1 = (TextView) rowView.findViewById(R.id.textView1);
-                //TextView textView2 = (TextView) rowView.findViewById(R.id.textView2);
+                TextView textView1 = (TextView) rowView.findViewById(R.id.textListMainMenu);
                 textView1.setText(values[position]);
+            ImageView imageView = (ImageView) rowView.findViewById(R.id.imageListMainMenu);
  
                 // Change icon based on name
@@ -39 +40 @@
                 System.out.println(s);
  
+                if (s.equals("Firmar")) {
+                imageView.setImageResource(R.drawable.ic_pluma);
+            } else if (s.equals("Verificar")) {
+                imageView.setImageResource(R.drawable.ic_verify);
+            } else if (s.equals("Cifrar")) {
+                imageView.setImageResource(R.drawable.ic_secure);
+            } else if (s.equals("Descifrar")) {
+                imageView.setImageResource(R.drawable.ic_not_secure);
+            } else if (s.equals("Compartir Archivos")) {
+                imageView.setImageResource(R.drawable.ic_share);
+            } else if (s.equals("Certificados")) {
+                imageView.setImageResource(R.drawable.ic_management);
+            }
                 return rowView;
         }

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

@@ -5 +5 @@
 
 
-import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -12 +11 @@
 import java.io.InputStream;
 
+
+import android.os.Build;
 import android.os.Bundle;
 import android.app.Activity;
@@ -79 +80 @@
                                         
                                         
-                                        manageKeyChain();
+                                        // Chequeo de version del API de Android para creacion de repositorio           
+                                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH){
+                                        //RelativeLayout certTab = (RelativeLayout) this.findViewById(R.id.linetab2);
+                                    //certTab.setVisibility(View.VISIBLE);            
+                                    //this.tabsListener.setKeyChainController(this.keyChainController);
+                                        Toast.makeText(context, "API < 4.0", duration).show();
+                                }
+                                        
+                                        //manageKeyChain();
                                         
                                         // lanzar activity de gestion de repositorio
-                                        //testRepository();
+                                        testRepository();
                                         
                                 }
@@ -90 +99 @@
                         }
                 });
+                
+                
                 
                 
@@ -135 +146 @@
         
         private void testRepository(){
-                
+                Intent intent = new Intent(this, CertificateRepositoryActivity.class);
+                startActivity(intent);
+
         }