Merge pull request #4912 from hippware/4905

for #4905
hippware · Mar 16, 2020 · 645a95b · 645a95b
2 parents 4b6cd94 + b96970b
commit 645a95b
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 46 deletions.
diff --git a/__tests__/wocky/friendshare.test.ts b/__tests__/wocky/friendshare.test.ts
@@ -23,7 +23,7 @@ describe('Friend Share', () => {
   // const differentLocation = {longitude: 1.1, latitude: 1.1, accuracy: 1}
 
   beforeAll(async () => {
-    jest.setTimeout(30000)
+    jest.setTimeout(50000)
     bob = await createUser()
     alice = await createUser()
   })
@@ -65,7 +65,6 @@ describe('Friend Share', () => {
     friend = alice.profile!.friends.get(bob.profile!.id)
     expect(friend!.shareType).toEqual(FriendShareTypeEnum.ALWAYS)
     expect(friend!.ownShareType).toEqual(FriendShareTypeEnum.ALWAYS)
-    expect(friend!.sharesLocation).toBeTruthy()
 
     // check sharing
     await alice.setLocation(theLocation)
@@ -113,6 +112,7 @@ describe('Friend Share', () => {
     // change location
     await bob.setLocation(differentLocation)
     await waitFor(() => !friend!.sharesLocation, 'end sharing location')
+    await waitFor(() => !bob.profile!.sharesLocation, 'end sharing location')
   })
 
   afterAll(async () => {

diff --git a/src/model/EventList.ts b/src/model/EventList.ts
@@ -13,7 +13,6 @@ import {PaginableLoadType} from '../store/Transport'
 import {waitFor} from '../utils/utils'
 import {EventLocationShare, EventLocationShareType} from './EventLocationShare'
 import {EventLocationShareEnd} from './EventLocationShareEnd'
-import {EventLocationShareNearbyStart} from './EventLocationShareNearbyStart'
 import {EventLocationShareNearbyEnd} from './EventLocationShareNearbyEnd'
 import {EventUserBeFriend, EventUserBeFriendType} from './EventUserBefriend'
 
@@ -34,7 +33,6 @@ export const EventEntity = types.union(
   EventFriendInvite,
   EventBotInvite,
   EventLocationShare,
-  EventLocationShareNearbyStart,
   EventLocationShareNearbyEnd,
   EventLocationShareEnd,
   EventUserBeFriend

diff --git a/src/model/EventLocationShareNearbyStart.ts b/src/model/EventLocationShareNearbyStart.ts
diff --git a/src/model/Profile.ts b/src/model/Profile.ts
@@ -66,6 +66,7 @@ export const Profile = types
     const res = {...snapshot}
     delete res.status
     delete res.statusUpdatedAt
+    delete res.sharesLocation
     // delete res.location - need to preserve location because now it is passed only via subscriptions
     delete res.subscribedBots
     return res
@@ -98,6 +99,7 @@ export const Profile = types
     },
     setLocation(location: ILocationSnapshot) {
       self._location = Location.create(location)
+      self.sharesLocation = true
       self.maybeUpdateActivity()
     },
     setFriend: (friend: boolean) => {
@@ -124,7 +126,6 @@ export const Profile = types
           }
           if (ownShareType) {
             self.ownShareType = ownShareType
-            self.sharesLocation = ownShareType === FriendShareTypeEnum.ALWAYS
           }
           superLoad(data)
 

diff --git a/src/utils/utils.ts b/src/utils/utils.ts
@@ -11,7 +11,6 @@ import {ILocationSnapshot} from '../model/Location'
 import {IMessageIn} from '../model/Message'
 import {IEventLocationShareEndData} from '../model/EventLocationShareEnd'
 import {IEventLocationShareData} from '../model/EventLocationShare'
-import {IEventLocationShareNearbyStartData} from '../model/EventLocationShareNearbyStart'
 import {IEventLocationShareNearbyEndData} from '../model/EventLocationShareNearbyEnd'
 import {IEventUserBeFriendData} from '../model/EventUserBefriend'
 
@@ -487,13 +486,6 @@ export function convertNotification(edge: any): IEventData | {deletedId: string}
         id,
       }
       return locationShareNotification
-    case 'LocationShareNearbyStartNotification':
-      const locationShareNearbyStartNotification: IEventLocationShareNearbyStartData = {
-        time,
-        sharedNearbyWith: convertProfile({...data.user, _accessedAt: time}),
-        id,
-      }
-      return locationShareNearbyStartNotification
     case 'LocationShareNearbyEndNotification':
       const locationShareNearbyEndNotification: IEventLocationShareNearbyEndData = {
         time,