v3.2.1

sidneys · Jan 19, 2017 · 0a47efd · 0a47efd
1 parent dd43d21
commit 0a47efd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/app/scripts/renderer/inject.js b/app/scripts/renderer/inject.js
@@ -134,21 +134,30 @@ let registerPushProxyobject = () => {
                 let pushExists = Boolean(window.pb.api.pushes.all.filter(function(push) { return push.iden === newPush.iden; }).length);
                 if (pushExists) { return false; }
 
-                // Check if push is targeted to specific device id
+                // Default: Show push
                 let appIsTarget = true;
-                let devicesObjs = window.pb.api.devices.objs;
-                let targetIden = newPush.target_device_iden;
-                if (targetIden && devicesObjs[targetIden]) {
-                    if (devicesObjs[targetIden].model && (devicesObjs[targetIden].model !== 'pb-for-desktop')) {
+
+                // Check if push is targeted to specific device
+                let currentDevicesObjs = window.pb.api.devices.objs;
+                let targetDeviceIden = newPush.target_device_iden;
+                if (targetDeviceIden && currentDevicesObjs[targetDeviceIden]) {
+                    if (currentDevicesObjs[targetDeviceIden].model && (currentDevicesObjs[targetDeviceIden].model !== 'pb-for-desktop')) {
                         appIsTarget = false;
                     }
                 }
 
+                // Check if push is directed
+                let targetDirection = newPush.direction;
+                if (targetDirection && targetDirection === 'outgoing') {
+                    appIsTarget = false;
+                }
+
                 if (appIsTarget) { pbPush.enqueuePush(newPush); }
 
                 pushesObj[iden] = newPush;
 
                 logger.debug('inject', 'proxy', 'iden', iden, 'appIsTarget', appIsTarget, 'pushExists', pushExists);
+                logger.debug('inject', newPush);
             }
         });
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pb-for-desktop",
   "productName": "PB for Desktop",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "PushBullet desktop application for macOS, Windows and Linux",
   "license": "MIT",
   "homepage": "https://sidneys.github.io/pb-for-desktop",
@@ -57,8 +57,8 @@
     "electron-editor-context-menu": "^1.1.1",
     "electron-settings": "^2.2.2",
     "electron-squirrel-startup": "^1.0.0",
-    "file-type": "^4.0.0",
-    "file-url": "^2.0.0",
+    "file-type": "^4.1.0",
+    "file-url": "^2.0.1",
     "fs-extra": "^2.0.0",
     "is-online": "^6.0.1",
     "keypath": "^0.0.1",