Merge branch 'master' into bzsinger-attendees

Author: bzsinger

RepresentsMe.xcodeproj/project.pbxproj

@@ -53,7 +53,6 @@
 		165B7F64225BE16C0095D9E1 /* SignupAddressViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 165B7F63225BE16C0095D9E1 /* SignupAddressViewController.swift */; };
 		166E6E2D227A2C19005F6B19 /* ExternalLinksSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 166E6E2C227A2C19005F6B19 /* ExternalLinksSettingsViewController.swift */; };
 		166E6E35227A4663005F6B19 /* LocationMapViewPopoverViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 166E6E33227A4663005F6B19 /* LocationMapViewPopoverViewController.swift */; };
-		166E6E36227A4663005F6B19 /* LocationMapViewPopoverViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 166E6E34227A4663005F6B19 /* LocationMapViewPopoverViewController.xib */; };
 		1683D02F2253B6FF00350471 /* MapActionButtons.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1683D02E2253B6FF00350471 /* MapActionButtons.xib */; };
 		1683D0312253B71F00350471 /* MapActionButtons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1683D0302253B71F00350471 /* MapActionButtons.swift */; };
 		1683D0332253C17600350471 /* CustomSearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1683D0322253C17600350471 /* CustomSearchBar.swift */; };
@@ -169,7 +168,6 @@
 		165B7F63225BE16C0095D9E1 /* SignupAddressViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignupAddressViewController.swift; sourceTree = "<group>"; };
 		166E6E2C227A2C19005F6B19 /* ExternalLinksSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExternalLinksSettingsViewController.swift; sourceTree = "<group>"; };
 		166E6E33227A4663005F6B19 /* LocationMapViewPopoverViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationMapViewPopoverViewController.swift; sourceTree = "<group>"; };
-		166E6E34227A4663005F6B19 /* LocationMapViewPopoverViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LocationMapViewPopoverViewController.xib; sourceTree = "<group>"; };
 		1683D02E2253B6FF00350471 /* MapActionButtons.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MapActionButtons.xib; sourceTree = "<group>"; };
 		1683D0302253B71F00350471 /* MapActionButtons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapActionButtons.swift; sourceTree = "<group>"; };
 		1683D0322253C17600350471 /* CustomSearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomSearchBar.swift; sourceTree = "<group>"; };
@@ -409,15 +407,6 @@
 			path = Entry;
 			sourceTree = "<group>";
 		};
-		166E6E37227A4666005F6B19 /* Map Popover */ = {
-			isa = PBXGroup;
-			children = (
-				166E6E33227A4663005F6B19 /* LocationMapViewPopoverViewController.swift */,
-				166E6E34227A4663005F6B19 /* LocationMapViewPopoverViewController.xib */,
-			);
-			path = "Map Popover";
-			sourceTree = "<group>";
-		};
 		16C72C30225FFC6500D43215 /* OfficialCardView */ = {
 			isa = PBXGroup;
 			children = (
@@ -544,7 +533,6 @@
 			isa = PBXGroup;
 			children = (
 				13895F30225F8EAA00FE405D /* AppState.swift */,
-				166E6E37227A4666005F6B19 /* Map Popover */,
 				165B7F65225BE1800095D9E1 /* Entry */,
 				13BD31B5223021F1000A6BEE /* TabBarViewController.swift */,
 				16B6B2C522209D8100DB3A5B /* MapViewController.swift */,
@@ -592,6 +580,7 @@
 			children = (
 				13A4F616225F848A0023E150 /* OfficialDetailsViewController.swift */,
 				3BE4383C2255347800EC049B /* OfficialContactViewController.swift */,
+				166E6E33227A4663005F6B19 /* LocationMapViewPopoverViewController.swift */,
 			);
 			path = OfficialDetails;
 			sourceTree = "<group>";
@@ -761,7 +750,6 @@
 				13BD31BB223025FC000A6BEE /* Font Awesome 5 Brands-Regular-400.otf in Resources */,
 				16C72C32225FFC7C00D43215 /* OfficialCardView.xib in Resources */,
 				3B1EFD61221F06EC003176BF /* LaunchScreen.storyboard in Resources */,
-				166E6E36227A4663005F6B19 /* LocationMapViewPopoverViewController.xib in Resources */,
 				13BD31BA223025FC000A6BEE /* Font Awesome 5 Free-Regular-400.otf in Resources */,
 				13BD31BC223025FC000A6BEE /* Font Awesome 5 Free-Solid-900.otf in Resources */,
 				3B1EFD5E221F06EC003176BF /* Assets.xcassets in Resources */,

RepresentsMe/AppDelegate.swift

@@ -54,7 +54,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         // MARK: - Remember Me
         // Log user out if Remember me not on
-        if !Util.rememberMeEnabled {
+        if !Util.rememberMeEnabled && !Util.biometricEnabled {
             UsersDatabase.shared.logoutUser { (error) in
                 // Do nothing
             }