Update 'maps.go'
This commit is contained in:
		
							
								
								
									
										10
									
								
								maps.go
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								maps.go
									
									
									
									
									
								
							@@ -11,7 +11,7 @@ import (
 | 
				
			|||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const (
 | 
					const (
 | 
				
			||||||
	interfaceName     = "io.github.rinigus.PureMaps.navigator"
 | 
						interfaceName     = "lomiri-app-launch--application-click--pure-maps.jonnius_pure-maps_3.2.0--"
 | 
				
			||||||
	iconProperty      = interfaceName + ".icon"
 | 
						iconProperty      = interfaceName + ".icon"
 | 
				
			||||||
	narrativeProperty = interfaceName + ".narrative"
 | 
						narrativeProperty = interfaceName + ".narrative"
 | 
				
			||||||
	manDistProperty   = interfaceName + ".manDist"
 | 
						manDistProperty   = interfaceName + ".manDist"
 | 
				
			||||||
@@ -38,7 +38,7 @@ func initPureMaps(ctx context.Context, wg WaitGroup, dev *infinitime.Device) err
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	// Define rules to listen for
 | 
						// Define rules to listen for
 | 
				
			||||||
	rules := []string{
 | 
						rules := []string{
 | 
				
			||||||
		"type='signal',interface='io.github.rinigus.PureMaps.navigator'",
 | 
							"type='signal',interface='lomiri-app-launch--application-click--pure-maps.jonnius_pure-maps_3.2.0--'",
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	var flag uint = 0
 | 
						var flag uint = 0
 | 
				
			||||||
	// Becode monitor for notifications
 | 
						// Becode monitor for notifications
 | 
				
			||||||
@@ -52,7 +52,7 @@ func initPureMaps(ctx context.Context, wg WaitGroup, dev *infinitime.Device) err
 | 
				
			|||||||
	var navigator dbus.BusObject
 | 
						var navigator dbus.BusObject
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if exists {
 | 
						if exists {
 | 
				
			||||||
		navigator = conn.Object("io.github.rinigus.PureMaps", "/io/github/rinigus/PureMaps/navigator")
 | 
							navigator = conn.Object("lomiri-app-launch--application-click--pure-maps.jonnius_pure-maps_3.2.0--", "/opt/click.ubuntu.com/.click/users/@all/pure-maps.jonnius/navigator")
 | 
				
			||||||
		err = setAll(navigator, dev)
 | 
							err = setAll(navigator, dev)
 | 
				
			||||||
		if err != nil {
 | 
							if err != nil {
 | 
				
			||||||
			log.Error("Error setting all navigation fields").Err(err).Send()
 | 
								log.Error("Error setting all navigation fields").Err(err).Send()
 | 
				
			||||||
@@ -88,7 +88,7 @@ func initPureMaps(ctx context.Context, wg WaitGroup, dev *infinitime.Device) err
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
				// The object must be retrieved in this loop in case PureMaps was not
 | 
									// The object must be retrieved in this loop in case PureMaps was not
 | 
				
			||||||
				// open at the time ITD was started.
 | 
									// open at the time ITD was started.
 | 
				
			||||||
				navigator = conn.Object("io.github.rinigus.PureMaps", "/io/github/rinigus/PureMaps/navigator")
 | 
									navigator = conn.Object("lomiri-app-launch--application-click--pure-maps.jonnius_pure-maps_3.2.0--", "/opt/click.ubuntu.com/.click/users/@all/pure-maps.jonnius/navigator")
 | 
				
			||||||
				member = strings.TrimSuffix(member, "Changed")
 | 
									member = strings.TrimSuffix(member, "Changed")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
				switch member {
 | 
									switch member {
 | 
				
			||||||
@@ -210,5 +210,5 @@ func pureMapsExists(ctx context.Context, conn *dbus.Conn) (bool, error) {
 | 
				
			|||||||
	if err != nil {
 | 
						if err != nil {
 | 
				
			||||||
		return false, err
 | 
							return false, err
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	return strSlcContains(names, "io.github.rinigus.PureMaps"), nil
 | 
						return strSlcContains(names, "lomiri-app-launch--application-click--pure-maps.jonnius_pure-maps_3.2.0--"), nil
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user