| 
						
					 | 
					
						
						
							
						
						5af59e1754
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/development-stable' into development
						
						
						
						
						
						
						
						# Conflicts:
#	app/src/main/java/com/jens/automation2/Trigger.java 
						
						
					 | 
					
						2022-02-22 22:21:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c569ab798c
					 | 
					
						
						
							
							Android 11
						
						
						
						
						
						
					 | 
					
						2022-02-22 22:15:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4e46878009
					 | 
					
						
						
							
							wrong field changed
						
						
						
						
						
						
					 | 
					
						2022-02-22 17:55:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						619f348a28
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/development-stable' into development
						
						
						
						
						
						
					 | 
					
						2022-02-20 18:57:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						72ccdd99f9
					 | 
					
						
						
							
							logging
						
						
						
						
						
						
					 | 
					
						2022-02-20 18:57:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c9d7399068
					 | 
					
						
						
							
							logging
						
						
						
						
						
						
					 | 
					
						2022-02-14 20:06:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9bf353ea3a
					 | 
					
						
						
							
							logging
						
						
						
						
						
						
					 | 
					
						2022-02-12 20:04:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						af90b566c8
					 | 
					
						
						
							
							new triggers: service or device starts
						
						
						
						
						
						
					 | 
					
						2022-02-07 20:09:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0e51c577d5
					 | 
					
						
						
							
							new triggers: service or device starts
						
						
						
						
						
						
					 | 
					
						2022-02-06 20:12:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						275091f9d7
					 | 
					
						
						
							
							libs
						
						
						
						
						
						
					 | 
					
						2022-02-06 15:02:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bc31c9a4c8
					 | 
					
						
						
							
							translation
						
						
						
						
						
						
					 | 
					
						2022-02-05 13:47:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b02220609b
					 | 
					
						
						
							
							show profile on main screen
						
						
						
						
						
						
					 | 
					
						2022-02-03 14:08:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						da244d1bbe
					 | 
					
						
						
							
							show profile on main screen
						
						
						
						
						
						
					 | 
					
						2022-02-03 14:05:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d402986dc3
					 | 
					
						
						
							
							ringtone
						
						
						
						
						
						
					 | 
					
						2022-02-03 13:41:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						85eee6c4da
					 | 
					
						
						
							
							Android 11
						
						
						
						
						
						
					 | 
					
						2022-02-02 23:35:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						34883519e4
					 | 
					
						
						
							
							ringtone
						
						
						
						
						
						
					 | 
					
						2022-02-02 18:06:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						92e405d396
					 | 
					
						
						
							
							Media playing trigger
						
						
						
						
						
						
					 | 
					
						2022-01-30 22:19:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1a8ce579a7
					 | 
					
						
						
							
							Media playing trigger
						
						
						
						
						
						
					 | 
					
						2022-01-30 22:08:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5899dd86f5
					 | 
					
						
						
							
							media playback listener
						
						
						
						
						
						
					 | 
					
						2022-01-30 20:13:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9387e8bdb2
					 | 
					
						
						
							
							media playback listener
						
						
						
						
						
						
					 | 
					
						2022-01-29 02:12:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5ed024774e
					 | 
					
						
						
							
							Control media playback
						
						
						
						
						
						
					 | 
					
						2022-01-27 23:05:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e76f9f69db
					 | 
					
						
						
							
							control media playback
						
						
						
						
						
						
					 | 
					
						2022-01-27 11:35:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0f1a12d28f
					 | 
					
						
						
							
							control media playback
						
						
						
						
						
						
					 | 
					
						2022-01-27 11:34:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						abaa961d3a
					 | 
					
						
						
							
							Control media playback
						
						
						
						
						
						
					 | 
					
						2022-01-26 22:53:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5f0eab5b30
					 | 
					
						
						
							
							control media playback
						
						
						
						
						
						
					 | 
					
						2022-01-26 21:40:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						92cb71ff2d
					 | 
					
						
						
							
							Control media playback
						
						
						
						
						
						
					 | 
					
						2022-01-25 23:10:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						71adc83b39
					 | 
					
						
						
							
							control media playback
						
						
						
						
						
						
					 | 
					
						2022-01-25 18:08:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						88f4d65b19
					 | 
					
						
						
							
							control media playback
						
						
						
						
						
						
					 | 
					
						2022-01-24 20:13:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0c5b4d3874
					 | 
					
						
						
							
							screen state trigger
						
						
						
						
						
						
					 | 
					
						2022-01-23 18:54:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d64ea8454e
					 | 
					
						
						
							
							screen state trigger
						
						
						
						
						
						
					 | 
					
						2022-01-22 02:20:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						94f6418076
					 | 
					
						
						
							
							notification action
						
						
						
						
						
						
					 | 
					
						2022-01-21 21:52:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						83ee19b4fa
					 | 
					
						
						
							
							ScreenStateReceiver
						
						
						
						
						
						
					 | 
					
						2022-01-21 20:57:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5ed6097ed6
					 | 
					
						
						
							
							libs updated
						
						
						
						
						
						
					 | 
					
						2022-01-21 19:28:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7e9d03104c
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/development-stable' into development
						
						
						
						
						
						
					 | 
					
						2022-01-21 14:31:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2e3e829abb
					 | 
					
						
						
							
							Bugfix in sendTextMessage variable replacement
						
						
						
						
						
						
					 | 
					
						2022-01-21 13:56:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						06080bb456
					 | 
					
						
						
							
							Update 'app/src/main/java/com/jens/automation2/Actions.java'
						
						
						
						
						
						
					 | 
					
						2022-01-21 13:00:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a5fd23949d
					 | 
					
						
						
							
							screen status trigger
						
						
						
						
						
						
					 | 
					
						2022-01-20 17:57:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						59c7a2d313
					 | 
					
						
						
							
							Notification channels
						
						
						
						
						
						
					 | 
					
						2022-01-17 20:09:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ec61a3ffa5
					 | 
					
						
						
							
							Service notification hint
						
						
						
						
						
						
					 | 
					
						2022-01-16 20:24:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a0c4cb7b6f
					 | 
					
						
						
							
							notification action
						
						
						
						
						
						
					 | 
					
						2022-01-15 23:36:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						22899347a1
					 | 
					
						
						
							
							close notification action
						
						
						
						
						
						
					 | 
					
						2022-01-15 13:47:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4b84a0c2f5
					 | 
					
						
						
							
							close notification action
						
						
						
						
						
						
					 | 
					
						2022-01-15 01:41:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						724192e80b
					 | 
					
						
						
							
							close notification action
						
						
						
						
						
						
					 | 
					
						2022-01-14 19:57:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f3c4a0fd91
					 | 
					
						
						
							
							ringmode bug fixed
						
						
						
						
						
						
					 | 
					
						2022-01-14 19:28:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f0853b3a30
					 | 
					
						
						
							
							close notification action
						
						
						
						
						
						
					 | 
					
						2022-01-11 17:27:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						98185a79df
					 | 
					
						
						
							
							close notification action
						
						
						
						
						
						
					 | 
					
						2022-01-11 16:04:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						246a02371a
					 | 
					
						
						
							
							notification action
						
						
						
						
						
						
					 | 
					
						2022-01-10 23:00:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9b8ae2271b
					 | 
					
						
						
							
							Notification action
						
						
						
						
						
						
					 | 
					
						2022-01-10 19:57:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b2cd3cf17c
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/notification_action' into development
						
						
						
						
						
						
					 | 
					
						2022-01-10 19:33:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cf4ec286ae
					 | 
					
						
						
							
							Notification action
						
						
						
						
						
						
					 | 
					
						2022-01-10 19:32:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |