← Back to branch summary

~w-shackleton/droidpad-android/stable

~w-shackleton/droidpad-android/stable

Viewing all changes in revision 51.1.2.

Committer: William Shackleton
Date: 2013-04-03 20:21:22 UTC
mfrom: (51.2.10 secure)
mto: This revision was merged to the branch mainline in revision 52.
Revision ID: w.shackleton@gmail.com-20130403202122-w9xcr2y1qifvh45s

Merged support for TLS connections. Still a few bugs.

files added:
lib

lib/sc-light-jdk15on-1.47.0.2-javadoc.jar

lib/sc-light-jdk15on-1.47.0.2.jar

lib/scprov-jdk15on-1.47.0.2-javadoc.jar

lib/scprov-jdk15on-1.47.0.2.jar

src/com

src/com/google

src/com/google/zxing

src/com/google/zxing/integration

src/com/google/zxing/integration/android

src/com/google/zxing/integration/android/IntentIntegrator.java

src/com/google/zxing/integration/android/IntentIntegratorV30.java

src/com/google/zxing/integration/android/IntentResult.java

src/uk/digitalsquid/droidpad/ConnectionInfo.java

src/uk/digitalsquid/droidpad/Pairing.java

src/uk/digitalsquid/droidpad/SecureConnection.java

files removed:
bin/AndroidManifest.xml

files modified:
.bzrignore

.classpath

binary-spec.txt

gen/uk/digitalsquid/droidpad/R.java

res/menu/menu.xml

res/values/strings.xml

res/xml/settingsmenu.xml

src/uk/digitalsquid/droidpad/App.java

src/uk/digitalsquid/droidpad/BGService.java

src/uk/digitalsquid/droidpad/Buttons.java

src/uk/digitalsquid/droidpad/Connection.java

src/uk/digitalsquid/droidpad/ConnectionCallbacks.java

src/uk/digitalsquid/droidpad/DroidPad.java

src/uk/digitalsquid/droidpad/MDNSBroadcaster.java

src/uk/digitalsquid/droidpad/buttons/ModeSpec.java

src/uk/digitalsquid/droidpad/serialise/BinarySerialiser.java

Show diffs side-by-side

added added

removed removed

bin/AndroidManifest.xml

binary-spec.txt

gen/uk/digitalsquid/droidpad/R.java

lib/sc-light-jdk15on-1.47.0.2-javadoc.jar

lib/sc-light-jdk15on-1.47.0.2.jar

lib/scprov-jdk15on-1.47.0.2-javadoc.jar

lib/scprov-jdk15on-1.47.0.2.jar

res/values/strings.xml

res/xml/settingsmenu.xml

src/com/google/

src/com/google/zxing/

src/com/google/zxing/integration/

src/com/google/zxing/integration/android/

src/com/google/zxing/integration/android/IntentIntegrator.java

src/com/google/zxing/integration/android/IntentIntegratorV30.java

src/com/google/zxing/integration/android/IntentResult.java

src/uk/digitalsquid/droidpad/App.java

src/uk/digitalsquid/droidpad/BGService.java

src/uk/digitalsquid/droidpad/Buttons.java

src/uk/digitalsquid/droidpad/Connection.java

src/uk/digitalsquid/droidpad/ConnectionCallbacks.java

src/uk/digitalsquid/droidpad/ConnectionInfo.java

src/uk/digitalsquid/droidpad/DroidPad.java

src/uk/digitalsquid/droidpad/MDNSBroadcaster.java

src/uk/digitalsquid/droidpad/Pairing.java

src/uk/digitalsquid/droidpad/SecureConnection.java

src/uk/digitalsquid/droidpad/buttons/ModeSpec.java

src/uk/digitalsquid/droidpad/serialise/BinarySerialiser.java

Older »