Merge pull request #57 from OsMo-lab/dev

Merge 1.13.157 with master
OsMo-lab · Feb 11, 2019 · 3ecccdc · 3ecccdc
2 parents 9597afe + 2d86cdf
commit 3ecccdc
Show file tree

Hide file tree

Showing 63 changed files with 2,341 additions and 3,193 deletions.
diff --git a/Messaging/FirebaseMessaging.framework/FirebaseMessaging b/Messaging/FirebaseMessaging.framework/FirebaseMessaging
diff --git a/Messaging/FirebaseMessaging.framework/Headers/FIRMessaging.h b/Messaging/FirebaseMessaging.framework/Headers/FIRMessaging.h
diff --git a/Messaging/FirebaseMessaging.framework/Headers/FirebaseMessaging.h b/Messaging/FirebaseMessaging.framework/Headers/FirebaseMessaging.h
diff --git a/Messaging/FirebaseMessaging.framework/Modules/module.modulemap b/Messaging/FirebaseMessaging.framework/Modules/module.modulemap
diff --git a/Messaging/Protobuf.framework/Protobuf b/Messaging/Protobuf.framework/Protobuf
diff --git a/iOsMo.xcodeproj/project.pbxproj b/iOsMo.xcodeproj/project.pbxproj
diff --git a/.../project.xcworkspace/xcuserdata/alexeysirotkin.xcuserdatad/UserInterfaceState.xcuserstate b/.../project.xcworkspace/xcuserdata/alexeysirotkin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...roject.xcworkspace/xcuserdata/alexeysirotkin.xcuserdatad/xcdebugger/Expressions.xcexplist b/...roject.xcworkspace/xcuserdata/alexeysirotkin.xcuserdatad/xcdebugger/Expressions.xcexplist
@@ -3,158 +3,228 @@
    version = "1.0">
    <ContextStates>
       <ContextState
-         contextName = "MonitoringViewController.uiSettings() -&gt; ():MonitoringViewController.swift">
+         contextName = "closure #1 in ConnectionManager.getServerInfo(key:):ConnectionManager.swift">
+      </ContextState>
+      <ContextState
+         contextName = "AppDelegate.presentViewController(url : URL) -&gt; Bool:AppDelegate.swift">
          <PersistentStrings>
             <PersistentString
-               value = "self.view.frame">
+               value = "url.pathComponents[2]">
+            </PersistentString>
+            <PersistentString
+               value = "url.pathComponents[1]">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "TcpConnection.parseOutput(String) -&gt; ():TcpConnection.swift">
+         contextName = "SendingManager.sending():SendingManager.swift">
          <PersistentStrings>
             <PersistentString
-               value = "output">
+               value = "connectionManager">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "BaseTcpConnection.sendNextCoordinates() -&gt; ():BaseTcpConnection.swift">
+         contextName = "GroupManager.(leaveGroup(String) -&gt; ()).(closure #1):GroupManager.swift">
+         <PersistentStrings>
+            <PersistentString
+               value = "u">
+            </PersistentString>
+         </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "GroupManager.getUser(Int, user : Int) -&gt; User?:GroupManager.swift">
+         contextName = "MapViewController.(viewDidLoad() -&gt; ()).(closure #2).(closure #1):MapViewController.swift">
          <PersistentStrings>
             <PersistentString
-               value = "foundGroup?.users.filter{$0.id == &quot;\(user)&quot;}">
+               value = "$1">
             </PersistentString>
             <PersistentString
-               value = "allGroups">
+               value = "$0">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "AccountViewController.(viewDidLoad() -&gt; ()).(closure #6):AccountViewController.swift">
+         contextName = "ConnectionManager.send(request:):ConnectionManager.swift">
+         <PersistentStrings>
+            <PersistentString
+               value = "device">
+            </PersistentString>
+         </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "LogViewController.Load(AnyObject) -&gt; ():LogViewController.swift">
+         contextName = "static ConnectionHelper.connectToServ() -&gt; Token?:ConnectionHelper.swift">
+      </ContextState>
+      <ContextState
+         contextName = "LogViewController.viewDidLoad() -&gt; ():LogViewController.swift">
          <PersistentStrings>
             <PersistentString
-               value = "logQueue">
+               value = "count">
             </PersistentString>
             <PersistentString
-               value = "toDisplay">
+               value = "text">
+            </PersistentString>
+            <PersistentString
+               value = "count.text">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "ObserverSet.notify(A) -&gt; ():ObserverSet.swift">
+         contextName = "GroupManager.(updateGroupsOnMap([Int]) -&gt; ()).(closure #2):GroupManager.swift">
       </ContextState>
       <ContextState
-         contextName = "BaseTcpConnection.closeSession(String) -&gt; ():BaseTcpConnection.swift">
+         contextName = "BaseTcpConnection.onSentCoordinate() -&gt; ():BaseTcpConnection.swift">
          <PersistentStrings>
             <PersistentString
-               value = "self.shouldCloseSession">
+               value = "self.coordinates.count">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "AccountViewController.tableView(UITableView, cellForRowAtIndexPath : NSIndexPath) -&gt; UITableViewCell:AccountViewController.swift">
+         contextName = "BaseTcpConnection.closeSession(String) -&gt; ():BaseTcpConnection.swift">
          <PersistentStrings>
             <PersistentString
-               value = "indexPath.group">
+               value = "self.shouldCloseSession">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "LogViewController.viewDidLoad() -&gt; ():LogViewController.swift">
+         contextName = "closure #1 in closure #1 in closure #1 in AppDelegate.applicationDidBecomeActive(_:):AppDelegate.swift">
+      </ContextState>
+      <ContextState
+         contextName = "BaseTcpConnection.sendNextCoordinates() -&gt; ():BaseTcpConnection.swift">
+      </ContextState>
+      <ContextState
+         contextName = "AccountViewController.(viewDidLoad() -&gt; ()).(closure #7):AccountViewController.swift">
+      </ContextState>
+      <ContextState
+         contextName = "GroupManager.(deactivateGroup(String) -&gt; ()).(closure #1):GroupManager.swift">
          <PersistentStrings>
             <PersistentString
-               value = "count">
+               value = "name">
             </PersistentString>
+         </PersistentStrings>
+      </ContextState>
+      <ContextState
+         contextName = "GroupManager.getUser(Int, user : Int) -&gt; User?:GroupManager.swift">
+         <PersistentStrings>
             <PersistentString
-               value = "text">
+               value = "foundGroup?.users.filter{$0.id == &quot;\(user)&quot;}">
             </PersistentString>
             <PersistentString
-               value = "count.text">
+               value = "allGroups">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "AppDelegate.presentViewController(url : URL) -&gt; Bool:AppDelegate.swift">
+         contextName = "ObserverSet.notify(A) -&gt; ():ObserverSet.swift">
+      </ContextState>
+      <ContextState
+         contextName = "AccountViewController.tableView(UITableView, cellForRowAtIndexPath : NSIndexPath) -&gt; UITableViewCell:AccountViewController.swift">
          <PersistentStrings>
             <PersistentString
-               value = "url.pathComponents[2]">
-            </PersistentString>
-            <PersistentString
-               value = "url.pathComponents[1]">
+               value = "indexPath.group">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "TcpConnection.parseJSONgroup(Any) -&gt; Group:TcpConnection.swift">
+         contextName = "GroupManager.(activateGroup(String) -&gt; ()).(closure #1):GroupManager.swift">
          <PersistentStrings>
             <PersistentString
-               value = "g[&quot;u&quot;]">
+               value = "$2">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "MonitoringViewController.(viewDidAppear(Bool) -&gt; ()).(closure #2):MonitoringViewController.swift">
+         contextName = "ConnectionManager.notifyAnswer(output:):ConnectionManager.swift">
       </ContextState>
       <ContextState
-         contextName = "static ConnectionHelper.connectToServ() -&gt; Token?:ConnectionHelper.swift">
+         contextName = "ConnectionManager.connect(_:):ConnectionManager.swift">
       </ContextState>
       <ContextState
-         contextName = "static ConnectionHelper.authenticate() -&gt; NSString?:ConnectionHelper.swift">
+         contextName = "GroupManager.groupList(Bool) -&gt; ():GroupManager.swift">
       </ContextState>
       <ContextState
-         contextName = "MonitoringViewController.(viewDidAppear(Bool) -&gt; ()).(closure #1):MonitoringViewController.swift">
+         contextName = "TcpConnection.parseOutput(String) -&gt; ():TcpConnection.swift">
          <PersistentStrings>
             <PersistentString
-               value = "$1">
+               value = "output">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "AccountViewController.(viewDidLoad() -&gt; ()).(closure #7):AccountViewController.swift">
+         contextName = "AccountViewController.(viewDidLoad() -&gt; ()).(closure #6):AccountViewController.swift">
+         <PersistentStrings>
+            <PersistentString
+               value = "$0.1.error_description">
+            </PersistentString>
+         </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "GroupManager.(activateGroup(String) -&gt; ()).(closure #1):GroupManager.swift">
+         contextName = "MapViewController.updateGroupsOnMap(groups : [Group]) -&gt; ():MapViewController.swift">
+      </ContextState>
+      <ContextState
+         contextName = "MonitoringViewController.uiSettings() -&gt; ():MonitoringViewController.swift">
          <PersistentStrings>
             <PersistentString
-               value = "$2">
+               value = "self.view.frame">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "GroupManager.(deactivateGroup(String) -&gt; ()).(closure #1):GroupManager.swift">
+         contextName = "LogViewController.Load(AnyObject) -&gt; ():LogViewController.swift">
          <PersistentStrings>
             <PersistentString
-               value = "name">
+               value = "logQueue">
+            </PersistentString>
+            <PersistentString
+               value = "toDisplay">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "BaseTcpConnection.onSentCoordinate() -&gt; ():BaseTcpConnection.swift">
+         contextName = "GroupManager.(enterGroup(String, nick : String) -&gt; ()).(closure #1):GroupManager.swift">
+      </ContextState>
+      <ContextState
+         contextName = "static SettingsManager.getKeyFromSettings(_:):SettingManager.swift">
          <PersistentStrings>
             <PersistentString
-               value = "self.coordinates.count">
+               value = "key">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "GroupManager.(leaveGroup(String) -&gt; ()).(closure #1):GroupManager.swift">
+         contextName = "static ConnectionHelper.authenticate() -&gt; NSString?:ConnectionHelper.swift">
+      </ContextState>
+      <ContextState
+         contextName = "MonitoringViewController.(viewDidAppear(Bool) -&gt; ()).(closure #2):MonitoringViewController.swift">
+      </ContextState>
+      <ContextState
+         contextName = "ConnectionManager.notifyAnswer(_:name:answer:):ConnectionManager.swift">
+      </ContextState>
+      <ContextState
+         contextName = "MapViewController.drawTrack(track : Track) -&gt; ():MapViewController.swift">
+      </ContextState>
+      <ContextState
+         contextName = "TcpConnection.parseJSONgroup(Any) -&gt; Group:TcpConnection.swift">
          <PersistentStrings>
             <PersistentString
-               value = "u">
+               value = "g[&quot;u&quot;]">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "GroupManager.groupList(Bool) -&gt; ():GroupManager.swift">
+         contextName = "MonitoringViewController.(viewDidAppear(Bool) -&gt; ()).(closure #1):MonitoringViewController.swift">
+         <PersistentStrings>
+            <PersistentString
+               value = "$1">
+            </PersistentString>
+         </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "GroupManager.(enterGroup(String, nick : String) -&gt; ()).(closure #1):GroupManager.swift">
+         contextName = "AppDelegate.application(_:didReceiveRemoteNotification:fetchCompletionHandler:):AppDelegate.swift">
+      </ContextState>
+      <ContextState
+         contextName = "closure #5 in ConnectionManager.completed(result:token:):ConnectionManager.swift">
       </ContextState>
    </ContextStates>
 </VariablesViewState>
diff --git a/iOsMo.xcodeproj/xcuserdata/alexeysirotkin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/iOsMo.xcodeproj/xcuserdata/alexeysirotkin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -3,19 +3,35 @@
    type = "1"
    version = "2.0">
    <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "iOsmo/AccountViewController.swift"
+            timestampString = "569098024.4490761"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "229"
+            endingLineNumber = "229"
+            landmarkName = "viewDidLoad()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "iOsmo/ConnectionManager.swift"
-            timestampString = "542101671.031462"
+            filePath = "iOsmo/AppDelegate.swift"
+            timestampString = "570819003.484794"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "244"
-            endingLineNumber = "244"
-            landmarkName = "closeConnection()"
+            startingLineNumber = "419"
+            endingLineNumber = "419"
+            landmarkName = "messaging(_:didReceive:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

diff --git a/iOsMo.xcodeproj/xcuserdata/alexeysirotkin.xcuserdatad/xcschemes/iOsmo.xcscheme b/iOsMo.xcodeproj/xcuserdata/alexeysirotkin.xcuserdatad/xcschemes/iOsmo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "1000"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -59,13 +59,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = "ru"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      allowLocationSimulation = "YES"
-      language = "ru">
+      allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
          <BuildableReference
@@ -92,7 +92,7 @@
       <AdditionalOptions>
       </AdditionalOptions>
       <LocationScenarioReference
-         identifier = "../../../../Downloads/RK_gpx _2017-02-23_2111.gpx"
+         identifier = "../../RK_gpx _2017-03-01_2007.gpx"
          referenceType = "0">
       </LocationScenarioReference>
    </LaunchAction>

diff --git a/iOsMo.xcworkspace/contents.xcworkspacedata b/iOsMo.xcworkspace/contents.xcworkspacedata
diff --git a/iOsMo.xcworkspace/xcuserdata/alexeysirotkin.xcuserdatad/UserInterfaceState.xcuserstate b/iOsMo.xcworkspace/xcuserdata/alexeysirotkin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/iOsMo.xcworkspace/xcuserdata/alexeysirotkin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/iOsMo.xcworkspace/xcuserdata/alexeysirotkin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "0"
+   version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "iOsmo/TcpConnection.swift"
+            timestampString = "562524676.0432431"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "467"
+            endingLineNumber = "467"
+            landmarkName = "parseForErrorJson(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
+</Bucket>