Changeset 16fd839 in dispositivos_moviles for TibisayMovil/src/ve/gob/cenditel/tibisaymovil/EncryptionResultActivity.java

Timestamp:

Oct 30, 2013, 5:40:46 PM (11 years ago)

Author:

Jose Ruiz <joseruiz@…>

Branches:

master

Children:

0d4fa20

Parents:

2ff9cec (diff), 0a5cb8c (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/?.classpath
TibisayMovil?/bin/TibisayMovil.apk
TibisayMovil?/bin/resources.ap_
TibisayMovil?/gen/ve/gob/cenditel/tibisaymovil/R.java
TibisayMovil?/res/values/strings.xml

File:

• TibisayMovil/src/ve/gob/cenditel/tibisaymovil/EncryptionResultActivity.java (modified) (1 diff)

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

@@ -49 +49 @@
                         getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.title_bar);
                 
-        TextView archivo_original_a_cifrar = (TextView) this.findViewById(R.id.archivo_original_a_cifrar);
-        TextView archivo_cifrado = (TextView) this.findViewById(R.id.archivo_cifrado);
+        TextView archivo_original_a_cifrar = (TextView) this.findViewById(R.id.archivo_original_pdf);
+        TextView archivo_cifrado = (TextView) this.findViewById(R.id.archivo_descifrado);
         TextView destinatario = (TextView) this.findViewById(R.id.destinatario);