Joey Hess 
								
							 
						 
						
							
							
								
							
							
	85c52c4029  
						 
						
							
							
								
								
								clean up protocol docs  
							
							
							
						 
						
							2012-11-05 15:52:03 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	db36b11e28  
						 
						
							
							
								
								
								switch to silent chat messages for XMPP pairing  
							
							... 
							
							
							
							Along the way, significantly cleaned up Assistant.XMPP, and made XMPP
message decoding more efficient. 
							
						 
						
							2012-11-05 15:40:56 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	a6cecfcf33  
						 
						
							
							
								
								
								workaround for Google Talk's insane handling of self-directed presence  
							
							... 
							
							
							
							Maybe the spec allows it, but broadcasting self-directed presence info to
all buddies is just insane.
I had to bring back the IQ messages for self-pairing, while still using
directed presence for other pairing. Ugly. 
							
						 
						
							2012-11-03 22:52:41 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	17e84a8096  
						 
						
							
							
								
								
								switch to directed presence for pair requests  
							
							... 
							
							
							
							Testing between Google Talk and prosody, the directed IQ messages
were not received. Google Talk probably only relays them between
clients using the same account.
I first tried even more directed presence, with each client JID being sent
a separate presence, but that didn't work on Google Talk, particularly
it was ignored when one client sent it to another client using the same
account.
So, presence directed at the user@host of the client to pair with. Tested
working between Google Talk and prosody (in both directions), as well
as between two clients with the same account on Google Talk, and
two clients with the same account on prosody.
Only problem with this form of directed presence is that if I also use it
for git pushes, more clients than are interested in a push's data will
receive it. So I may need some better approach, or a hybrid between
directed IQ and directed presence. 
							
						 
						
							2012-11-03 21:19:59 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	5108d4b364  
						 
						
							
							
								
								
								update xmpp protocol  
							
							... 
							
							
							
							Amusingly, I am not really using xmpp ping for pairing. I forgot to put in
the ping tag! And when I did, it stopped working, on Google Talk. Seems
it handles client to client pings, at least using the same JID, without
actually sending them to the end client. My mistake avoided this,
and seems to work, so I've left it as-is for now, with just the git-annex
tag in an IQ message. Also tested on prosody. 
							
						 
						
							2012-11-03 19:18:26 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	4331cf4e09  
						 
						
							
							
								
								
								Merge branch 'master' of ssh://git-annex.branchable.com  
							
							
							
						 
						
							2012-11-03 18:12:11 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	607fed5800  
						 
						
							
							
								
								
								blog for the day  
							
							
							
						 
						
							2012-11-03 18:11:46 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									2a01:e35:1382:f950:21d9:7aaa:461b:48ee 
								
							 
						 
						
							
							
								
							
							
	967d23d08a  
						 
						
							
							
								
								
								poll vote (Google Drive)  
							
							
							
						 
						
							2012-11-03 21:17:42 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	6f1521e046  
						 
						
							
							
								
								
								blog for the day  
							
							
							
						 
						
							2012-11-02 21:13:31 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	85f558aa58  
						 
						
							
							
								
								
								bloglet for the day  
							
							
							
						 
						
							2012-10-31 18:53:02 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									https://www.google.com/accounts/o8/id?id=AItOawnjrMQEhzd8xI81V9BL2jsKlNgVJLD7PKs 
								
							 
						 
						
							
							
								
							
							
	bf631bcb96  
						 
						
							
							
								
								
								Added a comment: Google Music as remote?  
							
							
							
						 
						
							2012-10-31 06:07:32 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									180.149.53.194 
								
							 
						 
						
							
							
								
							
							
	cdeb76fbdc  
						 
						
							
							
								
								
								poll vote (My phone (or MP3 player))  
							
							
							
						 
						
							2012-10-31 05:57:17 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	b8009a68e4  
						 
						
							
							
								
								
								blog for the day  
							
							
							
						 
						
							2012-10-30 19:47:18 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U 
								
							 
						 
						
							
							
								
							
							
	6f63bf730f  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2012-10-30 09:07:37 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U 
								
							 
						 
						
							
							
								
							
							
	24e339ab93  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2012-10-30 08:51:17 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U 
								
							 
						 
						
							
							
								
							
							
	f515aac8ab  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2012-10-30 08:44:32 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	d5945eeb4c  
						 
						
							
							
								
								
								blog for the day  
							
							
							
						 
						
							2012-10-29 17:56:29 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	64e1d7b579  
						 
						
							
							
								
								
								send git-annex tag in initial presence  
							
							... 
							
							
							
							Will be used for finding other git-annex clients for pairing 
							
						 
						
							2012-10-28 17:07:29 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	e7df22916d  
						 
						
							
							
								
								
								typoskis  
							
							
							
						 
						
							2012-10-28 16:56:43 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	ebb63e8038  
						 
						
							
							
								
								
								blog for the day  
							
							
							
						 
						
							2012-10-28 16:53:38 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									178.26.87.189 
								
							 
						 
						
							
							
								
							
							
	eb466fdca3  
						 
						
							
							
								
								
								poll vote (My phone (or MP3 player))  
							
							
							
						 
						
							2012-10-28 12:12:43 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	9144710a34  
						 
						
							
							
								
								
								blog for the day  
							
							
							
						 
						
							2012-10-27 19:59:17 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	ab15e567f9  
						 
						
							
							
								
								
								Merge branch 'master' of ssh://git-annex.branchable.com  
							
							
							
						 
						
							2012-10-27 11:32:37 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://joeyh.name/ 
								
							 
						 
						
							
							
								
							
							
	22c6e392d5  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2012-10-27 06:08:44 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									https://www.google.com/accounts/o8/id?id=AItOawmaM3-vbAh5B8tY_IL3yh31ik6cAVsgoPw 
								
							 
						 
						
							
							
								
							
							
	61bc8ba78c  
						 
						
							
							
								
								
								Added a comment: Haskell XMPP  
							
							
							
						 
						
							2012-10-27 05:54:53 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	6633a5158d  
						 
						
							
							
								
								
								update  
							
							
							
						 
						
							2012-10-27 00:57:53 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	fc06ccf355  
						 
						
							
							
								
								
								Merge branch 'xmpp'  
							
							
							
						 
						
							2012-10-27 00:55:13 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	67f4fe496f  
						 
						
							
							
								
								
								XEP-0126 is not compatable with my use of presence, remove it from TODO  
							
							
							
						 
						
							2012-10-27 00:54:10 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	cb765608ca  
						 
						
							
							
								
								
								update  
							
							
							
						 
						
							2012-10-27 00:50:45 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									128.151.150.17 
								
							 
						 
						
							
							
								
							
							
	50ad657cf2  
						 
						
							
							
								
								
								poll vote (My phone (or MP3 player))  
							
							
							
						 
						
							2012-10-27 04:34:19 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	9fc8257392  
						 
						
							
							
								
								
								xmpp reconnection  
							
							... 
							
							
							
							If it managed to run for 5 minutes, reconnect immediately. Otherwise,
wait 5 minutes before reconnecting. 
							
						 
						
							2012-10-27 00:06:17 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	d1e5f2d596  
						 
						
							
							
								
								
								Merge branch 'master' into xmpp  
							
							... 
							
							
							
							Conflicts:
	Assistant/Threads/NetWatcher.hs 
							
						 
						
							2012-10-26 19:42:24 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	26b96ff20c  
						 
						
							
							
								
								
								blog for the day  
							
							
							
						 
						
							2012-10-26 14:27:21 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	0b1cf3a766  
						 
						
							
							
								
								
								Merge branch 'master' into xmpp  
							
							... 
							
							
							
							Conflicts:
	Assistant/Threads/MountWatcher.hs
	Assistant/Threads/NetWatcher.hs 
							
						 
						
							2012-10-26 00:10:41 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	2018de53a3  
						 
						
							
							
								
								
								correction  
							
							
							
						 
						
							2012-10-25 17:16:58 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	d98101b41f  
						 
						
							
							
								
								
								blog for the day  
							
							
							
						 
						
							2012-10-25 17:12:07 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	52a48d1a78  
						 
						
							
							
								
								
								Merge branch 'master' into xmpp  
							
							
							
						 
						
							2012-10-25 14:43:55 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	ed48c49cf9  
						 
						
							
							
								
								
								todo  
							
							
							
						 
						
							2012-10-25 14:04:18 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	8c9c8e3110  
						 
						
							
							
								
								
								only use one push attribute  
							
							... 
							
							
							
							When pushing to multiple UUIDs, combine them all into a single push
attribute. 
							
						 
						
							2012-10-25 13:31:45 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									137.132.250.13 
								
							 
						 
						
							
							
								
							
							
	6239b24270  
						 
						
							
							
								
								
								poll vote (Google Drive)  
							
							
							
						 
						
							2012-10-25 05:47:30 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	1d955d1332  
						 
						
							
							
								
								
								Merge branch 'master' of ssh://git-annex.branchable.com  
							
							
							
						 
						
							2012-10-24 20:06:27 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	75ad5b062a  
						 
						
							
							
								
								
								add xmpp page  
							
							
							
						 
						
							2012-10-24 20:05:45 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									http://joeyh.name/ 
								
							 
						 
						
							
							
								
							
							
	6768238da5  
						 
						
							
							
								
								
								Added a comment  
							
							
							
						 
						
							2012-10-24 22:44:41 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	9aa9cb5bcf  
						 
						
							
							
								
								
								blog for the day  
							
							
							
						 
						
							2012-10-24 15:56:33 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									93.220.117.141 
								
							 
						 
						
							
							
								
							
							
	981aefaa06  
						 
						
							
							
								
								
								poll vote (Google Drive)  
							
							
							
						 
						
							2012-10-24 16:11:38 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	70c8324a72  
						 
						
							
							
								
								
								simplify  
							
							
							
						 
						
							2012-10-24 11:48:10 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	031bdf77b6  
						 
						
							
							
								
								
								think I had the tagged right the 1st time  
							
							
							
						 
						
							2012-10-24 11:46:31 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	034dace252  
						 
						
							
							
								
								
								ahah  
							
							
							
						 
						
							2012-10-24 11:45:00 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	78c7025781  
						 
						
							
							
								
								
								erm, I forget how this pagespec works  
							
							
							
						 
						
							2012-10-24 11:44:14 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	8eae88af4a  
						 
						
							
							
								
								
								fix tag matching  
							
							
							
						 
						
							2012-10-24 11:43:21 -04:00