Commit Graph

19 Commits

Author SHA1 Message Date
markholland 90985f3e9a 2012-09-24 Mark Holland <mark@mark-holland.me.uk>
* src/pandroid/agent/PandroidAgentListener.java:
	Removed asynctask when making contact in attempt
	to fix configuration loss after x time

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6996 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-09-24 16:43:51 +00:00
markholland b8234cce21 2012-08-24 Mark Holland <mark@mark-holland.me.uk>
* src/pandroid/agent/PandroidAgentListener.java:
	Reverted to original writeFile method, changed
	xml encoding header to iso-8859-1

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6971 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-09-13 15:16:56 +00:00
zarzuelo 0b5c0c0fc6 2012-09-12 Sergio Martin <sergio.martin@artica.es>
* src/pandroid/agent/PandroidAgent.java
	src/pandroid/agent/PandroidAgentTentacle.java
	src/pandroid/agent/Status.java
	src/pandroid/agent/PandroidAgentListener.java
	res/drawable-xhdpi/ic_launcher.png
	res/drawable-xhdpi/logo.png
	res/drawable-xhdpi/pandroid_large.png
	res/drawable-hdpi/ic_launcher.png
	res/drawable-ldpi/ic_launcher.png
	res/drawable-ldpi/logo.png
	res/drawable-ldpi/pandroid_large.png
	res/drawable-mdpi/ic_launcher.png: Fixed some
	warnings of not used variables and includes.
	Added new designs



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6962 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-09-12 10:44:53 +00:00
markholland f75104454e 2012-08-24 Mark Holland <mark@mark-holland.me.uk>
* AndroidManifest.xml: Added experimental start
	pandroid on device boot(not operational)

	* res/layout/setup.xml: Removed duplicate password
	button

	* res/layout/setupnosim.xml: Removed unused text view

	* src/pandroid/agent/core.java: set inventory to disabled
	by default

	* src/pandroid/agent/PandroidAgentListener.java: Fixed
	inventory report if condition

	* src/pandroid/agent/PandroidAgentTentacle.java: Fixed if
	condition when server response == null, Changed how data
	is written to serverOutput, fixes utf-8.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6909 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-08-24 01:43:50 +00:00
markholland e98005a74b 2012-08-22 Mark Holland <mark@mark-holland.me.uk>
* AndroidManifest.xml: Changed icon drawable to
	ic_launcher

	* res/drawable-hdpi: Added notification icon

	* res/drawable-ldpi: Added notification icon

	* res/drawable-mdpi: Added notification icon

	* res/drawable-xhdpi: Added notification icon

	* res/layout/setup.xml: Added inventory report checkbox,
	notification checkbox and stop/restart listener buttons.

	* res/layout/setupnosim.xml: Added inventory report checkbox,
	notification checkbox and stop/restart listener buttons.

	* res/values/strings.xml: Added strings for notification and
	stop/restart buttons, reflected in all locales

	* src/pandroid/agent/core.java: Added variables for notification
	and inventory report, fixed agentname, mobileurl mixup.

	* src/pandroid/agent/PandroidAgent.java: Removed splash screen, 
	Added check if app launched before and only restarts listener in
	this case. Added onPause and onDestroy methods to ensure no settings
	loss.

	* src/pandroid/agent/PandroidAgentListener.java: Added optional
	notification when pandroid alarm is enabled, removed loading toast,
	added inventory enabled check, added cancel notification method,
	changed xml format to utf-8(untested)

	* src/pandroid/agent/setup.java: Fixed mobile url, if no http:// or 
	https:// then http:// added automatically. Added stop/restart listener
	buttons, added inventory report and notification checkbox

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6902 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-08-22 02:57:53 +00:00
markholland 9abbbce1ce 2012-08-19 Mark Holland <mark@mark-holland.me.uk>
* res/layout/drawable-hdpi: Added help and about icons
	from sdk	

	* res/layout/drawable-ldpi: Added new vector images.
	Added help and about icons from sdk.

	* res/layout/drawable-mdpi:Added help and about icons
	from sdk.

	* res/layout/drawable-xhdpi: Added new higher
	resolution images. Added help and about icons from sdk

	* res/layout/password_choose.xml: UI tweak

	* res/layout/password_create.xml: UI tweak

	* res/layout/setup.xml: Changed webURL id, moved position
	of task spinner.

	* res/layout/setupnosim.xml: Changed webURL id, moved
	position of task spinner.

	* res/layout/status.xml: Removed start, stop, show and 
	hide xml buttons.

	* res/layout/statusnosim.xml: Removed start, stop, show 
	and hide xml buttons.

	* res/layout/welcome.xml: Added splash screen view with
	pandroid logo and version 3.0 text.

	* res/values/strings.xml: Changed order of strings to be
	more structured, removed unused correct_update string,
	fixed the "..." in loading string, fixed copyright symbol,
	added strings for seconds, runnning and stopped that were
	previously hardcoded, fixed apostrophe in don't.

	* res/values-de/strings.xml: Added strings for German locale

	* res/values-es/strings.xml: Added strings for Spanish locale
	
	* res/values-fr/strings.xml: Added strings for French locale

	* res/values-it/strings.xml: Added strings for Italian locale

	* res/values-ja/strings.xml: Added strings for Japanese locale

	* res/values-pt/strings.xml: Added strings for Portuguese locale

	* res/values-zh/strings.xml: Added strings for Chinese(simplified)
	locale

	* src/pandroid/agent/About.java: Changed URL to pandorafms.com from
	.org

	* src/pandroid/agent/core.java: Changed mobile url variable, 

	* src/pandroid/agent/Installation.java: Added comment explaining class.

	* src/pandroid/agent/PandroidAgent.java: Added splash screen dialog

	* src/pandroid/agent/PandroidAgentListener.java: Added loading toast on
	connect, moved contact into an asynctask, added application inventory to
	xml(app name;version;package name), fixed battery level to work on first
	connect, made all get methods private.

	* src/pandroid/agent/setup.java: Auto add http:// to mobile web url.

	* src/pandroid/agent/SMSBroadcastReceiver.java: Changed variable name.

	* src/pandroid/agent/status.java: swapped hardcoded strings to ones from
	res.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6881 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-08-19 06:23:11 +00:00
markholland b342dbc978 2012-08-03 Mark Holland <mark@mark-holland.me.uk>
* res/layout/password_entry.xml: UI tweaks

	* res/layout/setup.xml: Added mobile console
	textview and button

	* res/layout/setupnosim.xml: Added mobile console
	textview and button

	* res/layout/status.xml: Added roaming view

	* res/values/strings.xml: string for roaming, 
	roaming report, mobile site

	* src/pandroid/agent/core.java: Added variables
	for roaming and mobile site url

	* src/pandroid/agent/PandroidAgentListener.java: 
 	Added roaming report method and variables then add
	to xml

	* src/pandroid/agent/setup.java: Added mobile site
	view and full screen password input

	* src/pandroid/agent/status.java: Added roaming view

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6843 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-08-03 04:54:40 +00:00
markholland 5eb4d7f6c6 2012-07-09 Mark Holland <mark@mark-holland.me.uk>
* AndroidManifest.xml: Added Pandora FMS 
	comment to header.

	* res/layout/About.xml: Swapped hardcoded
	text for strings.

	* res/layout/help.xml: Added scrollview.

	* res/layout/password_choose.xml: View for dialog
	when choosing whether to have a password.

	* res/layout/password_create.xml: Added textviews
	with instructions.

	* res/layout/password_entry.xml: Swapped hardcoded
	text for strings.

	* res/layout/setup.xml: Added checkboxes for all
	modules.

	* res/layout/setupnosim.xml: View that only
	shows checkboxes for modules that don't need a sim
	card present.

	* res/values/strings.xml: Updated help string
	(english only). Lots of new strings, also
	added to strings-en and strings-es.

	* src/pandroid/agent/About.java: Added Pandora FMS 
	comment to header.

	* src/pandroid/agent/core.java: Added Pandora FMS 
	comment to header. Added variable for hello signal.
	Added reporting variables for all modules. Changed 
	alarm to be accessed in a static way. changed agent
	identifier from pandroid plus simID to pandroid plus
	install uid.

	* src/pandroid/agent/Help.java:	Added Pandora FMS 
	comment to header.

	* src/pandroid/agent/Installation.java: Calculates a
	unique installation uid.

	* src/pandroid/agent/PandroidAgent.java: hasSim now 
	works whether phone without sim and also tablet without
	capability for sim card. On resume sets hello signal to 1.

	* src/pandroid/agent/PandroidAgentListener.java: Removed
	unnecessary variables, all defaults come from Core.java.
	Ensure Hello signal changed to 0 after every connection.
	Variables for all module reporting, data only added to xml
	if enabled in setup.

	* src/pandroid/agent/setup.java: Added Pandora FMS 
	comment to header. Different views loaded depending
	on whether sim card is present. Added button for changing
	password. Added checkboxes for all modules. Added dialog
	for choosing whether to set a password. Added minimum
	password length and empty to remove password. Keyboard 
	dismissed upon completing dialogs.

	* src/pandroid/agent/SMSBroadcastReceiver.java: Added 
	Pandora FMS comment to header.

	* src/pandroid/agent/status.java: Added Pandora FMS 
	comment to header. Remove incorrect toast message
	when pressing start button.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6755 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-09 08:35:48 +00:00
markholland da4c8745c7 2012-07-04 Mark Holland <mark@mark-holland.me.uk>
* AndroidManifest.xml: Added permissions read_contacts
	and read_sms

	* res/layout/password_create.xml: Created view for
	password creation dialogue

	* res/layout/password_entry.xml: Created view for
	password entry dialogue

	* res/layout/status.xml: Converted most of data 
	into a table layout

	* res/layout/statusnosim.xml: Created status view
	only showing the data avaliable when device has
	no sim card

	* res/values/strings.xml: Added strings for bytes
	sent/received and password dialogues

	* src/pandroid/agent/core.java: added variables for
	bytes sent/received, hasSim and password. Changed 
	signal strength to integer.

	* src/pandroid/agent/PAndroidAgent.java: Added check
	if sim card present. Method for switching tabs from
	activities.

	* src/pandroid/agent/PandroidAgentListener.java: Added
	variables for bytes sent/received. Now if no sim card
	present SimID, NetworkOperator, SMSSent, NetworkType,
        PhoneType, SignalStrength, Calls, DataBytes modules aren't 		used or sent.

	* src/pandroid/agent/setup.java: Added methods for
	creating password and entering password when switching
	to setup tab(not completed). Added checkbox for simId
	and task reporting

	* src/pandroid/agent/status.java: Checks if sim present
	and displays view accordingly.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6733 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-04 01:32:06 +00:00
markholland 199fb87920 2012-06-26 Mark Holland <mark@mark-holland.me.uk>
* res/values/strings.xml: Added strings for 
	smsReceived, networkType, phoneType and calls.
	Replicated in values-en and values-es.

	* res/layout/setup.xml: Added checkboxes for simID
	and task reporting.

	* res/layout/status.xml: Added textviews for new data.

	* src/pandroid/agent/core.java: set simID
	reporting as disabled by default. Added variables
	for networkOperator, networkType, phoneType,
	signalStrength, incoming, missed and outgoing calls.

	* src/pandroid/agent/PandroidAgentListener.java: task,
	smsReceived, networkType, phoneType and calls methods
	and then added to XML. simID now checks whether
	enabled in user configuration.

	* src/pandroid/agent/setup.java: Added spinner for task
	selection.

	* src/pandroid/agent/SMSActivity.java: removed

	* src/pandroid/agent/SMSBroadcastReceiver.java: upon
	receiving a smsreceived intent, increments the stored
	number of smsReceived.

	* src/pandroid/agent/status.java: Added textviews for
	new methods mentioned above.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6708 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-26 00:47:47 +00:00
markholland 240209747b 2012-06-19 Mark Holland <mark@mark-holland.me.uk>
* res/layout.main.xml: removed as no longer used
	 in pandroid 2.0

	* res/values/strings.xml: Added strings for simID,
	upTime, start, loading and agent stopped. Replicated
	in values-en and values-es
	
	* src/pandroid/agent/core.java: Added variables 
	for simID and upTime
 	
	* src/pandroid/agent/PandroidAgent.java: commented
	out unnecessary code from version 1.0. Removed
	absolute tab height as it interferes with high
	density screens.

	* src/pandroid/agent/PandroidAgentListener.java: 
	Android version is now set as per device rather 
	than a fixed string. simID, upTime and networkOperator 	methods
	and then added to XML

	* src/pandroid/agent/setup.java: commented
	out unnecessary code from version 1.0

	* src/pandroid/agent/SMSActivity.java: Started work

	* src/pandroid/agent/SMSBroadcastReceiver.java: 
	Started work

	* src/pandroid/agent/status.java: Created onStart
	method to better follow android standard. run()
	is executed here. Fixed way toasts for connection 
	messages are handled. Added textviews for simID 
	and upTime values. added start/stop, show and hide 
	XML buttons for debugging purposes.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6601 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 22:37:03 +00:00
mdtrooper 9f45d829dd 2011-10-31 Miguel de Dios <miguel.dedios@artica.es>
* android/src/pandroid/agent/PandroidAgentListener.java: fixed type of
	memory module.
	
	* android/res/values/strings.xml, android/res/values-en/strings.xml,
	android/res/values-es/strings.xml: rewrote the help text for to erase the
	references to proximity module.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5102 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-10-31 13:47:56 +00:00
mdtrooper 38e6363c1c 2011-10-24 Miguel de Dios <miguel.dedios@artica.es>
* android/src/pandroid/agent/PandroidAgentListener.java: fixed the
	location and change to show the percent memory free.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5078 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-10-24 16:32:14 +00:00
mdtrooper e89df1fb95 2011-10-20 Miguel de Dios <miguel.dedios@artica.es>
* AndroidManifest.xml: added new activies and permission of batery.
	
	* src/pandroid/agent/PandroidAgent.java, src/pandroid/agent/Setup.java,
	src/pandroid/agent/Status.java,
	src/pandroid/agent/PandroidAgentListener.java,
	src/pandroid/agent/EventReceiver.java, src/pandroid/agent/Help.java,
	src/pandroid/agent/About.java: wip.
	
	* res/values/strings.xml, res/values-en/strings.xml,
	res/values-es/strings.xml: added strings and translations into spanish.

	* res/menu/options_menu.xml: added a menu file.

	* res/drawable-ldpi/help.png, res/drawable-ldpi/about.png,
	res/drawable-ldpi/pandorafms_logo.png: added image files.

	* res/layout/setup.xml, res/layout/status.xml, res/layout/help.xml,
	res/layout/about.xml: wip and added the need layout for new activies.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5072 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-10-20 13:01:42 +00:00
mdtrooper 90d3b6d840 2011-10-12 Miguel de Dios <miguel.dedios@artica.es>
* android/.classpath, android/libs/commons-lang3-3.0.1.jar: added the
	library "org.apache.commons.lang".
	
	* android/AndroidManifest.xml: added the activities Status and Setup. And
	apply theme the no titlebar to main activity.
	
	* android/res/drawable-hdpi/logo.png, android/res/drawable-hdpi/icon.png,
	android/res/drawable-mdpi/logo.png, android/res/drawable-mdpi/icon.png:
	removed the images with same size or quality for the subtypes devices.
	
	* android/res/layout/setup.xml, android/res/layout/status.xml: added the
	layouts for the new activies.
	
	* android/res/values/strings.xml: added the new strings.
	
	* android/src/pandroid/agent/Setup.java,
	android/src/pandroid/agent/Status.java: added the new activies.
	
	* android/src/pandroid/agent/Core.java: added utility class for the proyect.
	
	* android/src/pandroid/agent/PandroidAgent.java: added the lost comment
	header with the license. started to modify to show as tabactivity and other
	changes.
	
	* android/src/pandroid/agent/PandroidAgentTentacle.java: added the lost
	comment header with the license.

	* android/src/pandroid/agent/PandroidAgentListener.java: added the lost
	comment header with the license. And wip for the new data to monitorice.
	
	* android/src/pandroid/agent/EventReceiver.java: added the lost comment
	header with the license. And added some traces.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5062 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-10-12 18:58:48 +00:00
zarzuelo ae789baf76 2011-02-10 Sergio Martin <sergio.martin@artica.es>
* android/src/pandroid/agent/PandroidAgent.java
	android/bin/Copy of Copy of Pandroid Agent.apk
	android/res/drawable-ldpi/logo.png
	android/res/drawable-ldpi/icon.png
	android/res/drawable-mdpi/logo.png
	android/res/drawable-mdpi/icon.png: Removed an unecessary apk
	file, added icons and logos to low and middle quality, 
	fixed xml file deletion, setted farscape as default host 
	and added to the default agent name a unique identifier



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3820 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-02-10 16:22:51 +00:00
zarzuelo 479f09cea2 2011-02-07 Sergio Martin <sergio.martin@artica.es>
* android/AndroidManifest.xml
	android/src/pandroid/agent/PandroidAgent.java
	android/src/pandroid/agent/PandroidAgentListener.java
	android/bin/pandroid/agent/PandroidAgentListener$2.class
	android/bin/pandroid/agent/PandroidAgentListener$3.class
	android/bin/pandroid/agent/PandroidAgentListener$MyLocationListener.class
	android/bin/pandroid/agent/PandroidAgentListener$1.class
	android/bin/pandroid/agent/PandroidAgent.class
	android/bin/pandroid/agent/PandroidAgentListener.class
	android/bin/pandroid/agent/PandroidAgent$1.class
	android/bin/pandroid/agent/PandroidAgent$2.class
	android/bin/pandroid/agent/PandroidAgent$3.class
	android/bin/pandroid/agent/PandroidAgent$4.class
	android/bin/pandroid/agent/PandroidAgent$5.class
	android/bin/pandroid/agent/PandroidAgent$6.class
	android/bin/pandroid/agent/PandroidAgent$7.class
	android/bin/resources.ap_
	android/bin/classes.dex
	android/res/drawable-hdpi/icon.png: Clean the code, changed the 
	app icon, added modules to the proximity and orientation sensors
	and fixed little bugs



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3808 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-02-07 16:53:49 +00:00
zarzuelo 95a475d751 2011-02-01 Sergio Martin <sergio.martin@artica.es>
* android/AndroidManifest.xml
	android/src/pandroid/agent/PandroidAgent.java
	android/src/pandroid/agent/PandroidAgentTentacle.java
	android/src/pandroid/agent/PandroidAgentListener.java
	android/src/pandroid/agent/EventReceiver.java
	android/bin/Pandroid Agent v0.3.apk
	android/bin/pandroid/agent/PandroidAgentListener$MyLocationListener.class
	android/bin/pandroid/agent/PandroidAgentListener$1.class
	android/bin/pandroid/agent/PandroidAgent.class
	android/bin/pandroid/agent/R$id.class
	android/bin/pandroid/agent/PandroidAgentListener.class
	android/bin/pandroid/agent/R$string.class
	android/bin/pandroid/agent/tentacle_client.class
	android/bin/pandroid/agent/R$layout.class
	android/bin/pandroid/agent/PandroidAgent$1.class
	android/bin/pandroid/agent/PandroidAgent$2.class
	android/bin/pandroid/agent/EventReceiver.class
	android/bin/pandroid/agent/PandroidAgent$3.class
	android/bin/pandroid/agent/PandroidAgent$4.class
	android/bin/pandroid/agent/PandroidAgent$5.class
	android/bin/pandroid/agent/PandroidAgent$6.class
	android/bin/pandroid/agent/PandroidAgent$7.class
	android/bin/resources.ap_
	android/bin/classes.dex
	android/res/layout/main.xml
	android/gen/pandroid/agent/R.java: Coded the heavy part of app to
	background in a service and changed the way of do the contact from
	loops to android alarms to fix the app sleep when screen off.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3794 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-02-01 17:36:54 +00:00
zarzuelo 412b9a7a63 2011-01-26 Sergio Martin <sergio.martin@artica.es>
* android
	android/default.properties
	android/.classpath
	android/proguard.cfg
	android/assets
	android/.project
	android/AndroidManifest.xml
	android/src
	android/src/pandroid
	android/src/pandroid/agent
	android/src/pandroid/agent/PandroidAgentTentacle.java
	android/src/pandroid/agent/PandroidAgent.java
	android/bin
	android/bin/pandroid
	android/bin/pandroid/agent
	android/bin/pandroid/agent/PandroidAgent$8.class
	android/bin/pandroid/agent/PandroidAgent$9.class
	android/bin/pandroid/agent/PandroidAgent.class
	android/bin/pandroid/agent/R$id.class
	android/bin/pandroid/agent/PandroidAgent$MyLocationListener.class
	android/bin/pandroid/agent/R$string.class
	android/bin/pandroid/agent/tentacle_client.class
	android/bin/pandroid/agent/R$attr.class
	android/bin/pandroid/agent/R.class
	android/bin/pandroid/agent/R$layout.class
	android/bin/pandroid/agent/PandroidAgent$1.class
	android/bin/pandroid/agent/PandroidAgent$2.class
	android/bin/pandroid/agent/PandroidAgent$3.class
	android/bin/pandroid/agent/PandroidAgent$4.class
	android/bin/pandroid/agent/R$drawable.class
	android/bin/pandroid/agent/PandroidAgent$5.class
	android/bin/pandroid/agent/PandroidAgent$6.class
	android/bin/pandroid/agent/PandroidAgent$7.class
	android/bin/resources.ap_
	android/bin/Copy of Copy of Pandroid Agent.apk
	android/bin/classes.dex
	android/res
	android/res/values
	android/res/values/strings.xml
	android/res/drawable-hdpi
	android/res/drawable-hdpi/logo.png
	android/res/drawable-hdpi/icon.png
	android/res/drawable-ldpi
	android/res/drawable-ldpi/icon.png
	android/res/drawable-mdpi
	android/res/drawable-mdpi/icon.png
	android/res/layout
	android/res/layout/main.xml
	android/gen
	android/gen/pandroid
	android/gen/pandroid/agent
	android/gen/pandroid/agent/R.java: Created the
	first android agent with report of battery level 
	and basic GPS location coordinates report



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3779 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-01-26 19:15:48 +00:00