misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								dbf4d37624 
								
							 
						 
						
							
							
								
								Adding version for release  
							
							 
							
							
							
						 
						
							2015-12-27 15:19:37 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								5fe43284ee 
								
							 
						 
						
							
							
								
								Displays nearby categories on top instead of below recent ones  
							
							 
							
							
							
						 
						
							2015-12-27 14:17:18 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								7273958b8e 
								
							 
						 
						
							
							
								
								Implemented check for null query, other minor changes  
							
							 
							
							
							
						 
						
							2015-12-27 14:13:39 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								640ff499c6 
								
							 
						 
						
							
							
								
								Minor changes 2  
							
							 
							
							
							
						 
						
							2015-12-25 20:12:53 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Josephine Lim 
								
							 
						 
						
							
							
							
							
								
							
							
								05104fe111 
								
							 
						 
						
							
							
								
								Merge pull request  #9  from misaochan/display-categories  
							
							 
							
							... 
							
							
							
							Display categories 
							
						 
						
							2015-12-25 20:10:22 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								8d4787e493 
								
							 
						 
						
							
							
								
								Minor changes  
							
							 
							
							
							
						 
						
							2015-12-25 20:09:01 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Josephine Lim 
								
							 
						 
						
							
							
							
							
								
							
							
								c732f75d6b 
								
							 
						 
						
							
							
								
								Merge pull request  #8  from misaochan/display-categories  
							
							 
							
							... 
							
							
							
							Needs to be tidied up, but will do that after receiving feedback. Will remove debugging messages and uncomment the UploadController statement once considered almost ready for merge 
							
						 
						
							2015-12-25 19:51:29 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								8c979cf751 
								
							 
						 
						
							
							
								
								Displays categories in CategorizationFragment.java  
							
							 
							
							
							
						 
						
							2015-12-25 19:49:21 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								7034f628de 
								
							 
						 
						
							
							
								
								Attempt at adding new category list to adapter  
							
							 
							
							... 
							
							
							
							Doesn't seem to show up. Might be adding in wrong place 
							
						 
						
							2015-12-25 19:44:10 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								9756513a89 
								
							 
						 
						
							
							
								
								Debugging stuff, revert later  
							
							 
							
							
							
						 
						
							2015-12-25 19:18:56 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								d73cbc3eb8 
								
							 
						 
						
							
							
								
								Checks for whether any nearby categories found  
							
							 
							
							
							
						 
						
							2015-12-25 19:06:05 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								7c40e74f25 
								
							 
						 
						
							
							
								
								Put in basic accessor method for categories  
							
							 
							
							
							
						 
						
							2015-12-25 18:56:22 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								37e76461fa 
								
							 
						 
						
							
							
								
								Stripped strings before adding to Set  
							
							 
							
							... 
							
							
							
							Instead of doing it after 
							
						 
						
							2015-12-25 18:34:59 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								d7bc231093 
								
							 
						 
						
							
							
								
								Strips "Category:" from category strings  
							
							 
							
							
							
						 
						
							2015-12-25 18:32:38 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								0f50fc790e 
								
							 
						 
						
							
							
								
								Stripped superfluous "title=" output  
							
							 
							
							
							
						 
						
							2015-12-25 18:10:08 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								47b24f9603 
								
							 
						 
						
							
							
								
								Removed ns field  
							
							 
							
							... 
							
							
							
							There does not seem to be a need to display that 
							
						 
						
							2015-12-25 18:05:12 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								4a3a795751 
								
							 
						 
						
							
							
								
								Minor changes  
							
							 
							
							... 
							
							
							
							to remove excessive debugging print 
							
						 
						
							2015-12-25 17:58:40 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								f5a42ac00b 
								
							 
						 
						
							
							
								
								Got categorySet to work  
							
							 
							
							... 
							
							
							
							categorySet now stores a unique copy of each category found in the query 
							
						 
						
							2015-12-25 17:53:12 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								3a455418a3 
								
							 
						 
						
							
							
								
								Trying to access categorySet  
							
							 
							
							
							
						 
						
							2015-12-24 17:29:03 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								fa060bb41e 
								
							 
						 
						
							
							
								
								Minor change  
							
							 
							
							
							
						 
						
							2015-12-24 15:23:11 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								ca87e5a4ef 
								
							 
						 
						
							
							
								
								Trying to add categories to HashSet  
							
							 
							
							... 
							
							
							
							Causes error 
							
						 
						
							2015-12-24 15:18:10 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								38cf720b4b 
								
							 
						 
						
							
							
								
								Minor refactoring  
							
							 
							
							... 
							
							
							
							Make buildURL private 
							
						 
						
							2015-12-24 14:31:35 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								4a400df5dd 
								
							 
						 
						
							
							
								
								Fixes crashes  
							
							 
							
							... 
							
							
							
							Implements null checking to prevent app from crashing when URI is
invalid or when picture has no GPS information 
							
						 
						
							2015-12-23 22:15:50 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								77b8ab0c4c 
								
							 
						 
						
							
							
								
								Minor changes  
							
							 
							
							... 
							
							
							
							As per @Niedzielski's feedback 
							
						 
						
							2015-12-23 20:57:36 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								b7ebd202f3 
								
							 
						 
						
							
							
								
								Minor fixes  
							
							 
							
							
							
						 
						
							2015-12-23 20:34:24 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								54dedf2cfd 
								
							 
						 
						
							
							
								
								Added synchronized to getQueue()  
							
							 
							
							
							
						 
						
							2015-12-23 20:06:20 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nicolas Raoul 
								
							 
						 
						
							
							
							
							
								
							
							
								d98dc42368 
								
							 
						 
						
							
							
								
								Merge pull request  #33  from misaochan/api-calls  
							
							 
							
							... 
							
							
							
							Implemented calls to API to extract categories 
							
						 
						
							2015-12-23 07:27:30 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								3797d0d5cd 
								
							 
						 
						
							
							
								
								Added Category model and extracted categories  
							
							 
							
							
							
						 
						
							2015-12-23 17:58:04 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								9a1d10fe8f 
								
							 
						 
						
							
							
								
								Minor changes  
							
							 
							
							
							
						 
						
							2015-12-23 16:01:12 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								8b062147bc 
								
							 
						 
						
							
							
								
								Added documentation for UrlBuilder helper class  
							
							 
							
							... 
							
							
							
							(sorry, previous commit was misnamed) 
							
						 
						
							2015-12-22 17:02:37 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								f01b0aa840 
								
							 
						 
						
							
							
								
								Added documentation for helper UrlBuilder class  
							
							 
							
							
							
						 
						
							2015-12-22 17:00:42 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								44890bee3d 
								
							 
						 
						
							
							
								
								Added comment  
							
							 
							
							
							
						 
						
							2015-12-22 16:53:46 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								5df7c231c0 
								
							 
						 
						
							
							
								
								URL with extracted coords passed to APICalls  
							
							 
							
							
							
						 
						
							2015-12-22 16:51:58 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								27a1557e11 
								
							 
						 
						
							
							
								
								Extra GSON libs needed  
							
							 
							
							... 
							
							
							
							Unsure if it should be added here, will revert this commit if it should
not 
							
						 
						
							2015-12-22 16:41:12 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								506c2ab624 
								
							 
						 
						
							
							
								
								Added incomplete APICalls class  
							
							 
							
							... 
							
							
							
							To make http requests to API
TODO: Find out how to construct Category models 
							
						 
						
							2015-12-22 16:40:47 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								9066c7da34 
								
							 
						 
						
							
							
								
								Implemented UrlBuilder static class  
							
							 
							
							... 
							
							
							
							To build URL for MediaWiki API query 
							
						 
						
							2015-12-22 15:07:00 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nicolas Raoul 
								
							 
						 
						
							
							
							
							
								
							
							
								31f78b4b6b 
								
							 
						 
						
							
							
								
								Merge pull request  #31  from misaochan/gps-coords  
							
							 
							
							... 
							
							
							
							Extracts gps coords 
							
						 
						
							2015-12-18 12:31:52 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								ee2eb417f4 
								
							 
						 
						
							
							
								
								Final fixes  
							
							 
							
							
							
						 
						
							2015-12-19 00:30:58 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								b16032eb84 
								
							 
						 
						
							
							
								
								Adding FilePathConverter class  
							
							 
							
							... 
							
							
							
							(Dunno why this wasn't included in previous commit...) 
							
						 
						
							2015-12-18 16:21:59 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								ac83480915 
								
							 
						 
						
							
							
								
								Refactored to put URI conversions in its own class  
							
							 
							
							... 
							
							
							
							Instead of lumping it with GPS extraction code 
							
						 
						
							2015-12-18 16:21:20 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								87b23b8494 
								
							 
						 
						
							
							
								
								Final changes  
							
							 
							
							... 
							
							
							
							Re-enabled uploading code (previously disabled for debugging purposes) 
							
						 
						
							2015-12-18 15:43:54 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								8f724e461e 
								
							 
						 
						
							
							
								
								Altered coord string to format required by API  
							
							 
							
							
							
						 
						
							2015-12-18 15:33:25 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								875e1556f7 
								
							 
						 
						
							
							
								
								More double-related fixes  
							
							 
							
							
							
						 
						
							2015-12-18 15:25:16 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								3ffcb8fd57 
								
							 
						 
						
							
							
								
								Converted Floats and Doubles to double where possible  
							
							 
							
							
							
						 
						
							2015-12-18 15:21:00 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								5a4251fe55 
								
							 
						 
						
							
							
								
								Fixed minor issues  
							
							 
							
							
							
						 
						
							2015-12-18 14:53:51 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								7804546ae3 
								
							 
						 
						
							
							
								
								Added decimal coord conversion  
							
							 
							
							
							
						 
						
							2015-12-18 13:39:06 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								131b9815af 
								
							 
						 
						
							
							
								
								Minor fixes 2  
							
							 
							
							
							
						 
						
							2015-12-17 19:33:57 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								204115de44 
								
							 
						 
						
							
							
								
								Minor fixes  
							
							 
							
							
							
						 
						
							2015-12-17 19:10:05 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								966ff386cd 
								
							 
						 
						
							
							
								
								Fixed refactor problem  
							
							 
							
							... 
							
							
							
							ImageProcessing class should work now.
TODO: Add conversion method 
							
						 
						
							2015-12-17 17:35:24 +13:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									misaochan 
								
							 
						 
						
							
							
							
							
								
							
							
								e74ead1655 
								
							 
						 
						
							
							
								
								Attempt at tidying code into a new class  
							
							 
							
							... 
							
							
							
							getContentResolver() method does not work 
							
						 
						
							2015-12-16 18:18:45 +13:00