From d84f1783e0aca08f8b0add0dec4f91585585a648 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Sat, 22 Oct 2016 02:35:48 +0800
Subject: [PATCH] force Application User Model ID for Windows Store

---
 installer/appx/filebot.l4j.ini                         | 3 +++
 source/net/filebot/Main.java                           | 2 +-
 source/net/filebot/Settings.java                       | 4 ++++
 source/net/filebot/ui/subtitle/SubtitleDropTarget.java | 3 +--
 source/net/filebot/ui/subtitle/SubtitlePanel.java      | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/installer/appx/filebot.l4j.ini b/installer/appx/filebot.l4j.ini
index 29a6557e..0139ba65 100644
--- a/installer/appx/filebot.l4j.ini
+++ b/installer/appx/filebot.l4j.ini
@@ -19,3 +19,6 @@
 
 # look for fpcalc here
 -Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe"
+
+# force Application User Model ID for Windows Store
+-Dnet.filebot.AppUserModelID=PointPlanck.FileBot
diff --git a/source/net/filebot/Main.java b/source/net/filebot/Main.java
index b01fdfe7..05047077 100644
--- a/source/net/filebot/Main.java
+++ b/source/net/filebot/Main.java
@@ -246,7 +246,7 @@ public class Main {
 			frame.setIconImages(ResourceManager.getApplicationIcons());
 		} else if (isWindowsApp()) {
 			// Windows specific configuration
-			WinAppUtilities.setAppUserModelID("net.filebot.FileBot"); // support Windows 7 taskbar behaviours
+			WinAppUtilities.setAppUserModelID(Settings.getApplicationUserModelID()); // support Windows 7 taskbar behaviours
 			frame.setIconImages(ResourceManager.getApplicationIcons());
 		} else {
 			// generic Linux/FreeBSD/Solaris configuration
diff --git a/source/net/filebot/Settings.java b/source/net/filebot/Settings.java
index 2d1d768a..7e2a497f 100644
--- a/source/net/filebot/Settings.java
+++ b/source/net/filebot/Settings.java
@@ -118,6 +118,10 @@ public final class Settings {
 		return false;
 	}
 
+	public static String getApplicationUserModelID() {
+		return System.getProperty("net.filebot.AppUserModelID", getApplicationName());
+	}
+
 	public static FileChooser getPreferredFileChooser() {
 		return FileChooser.valueOf(System.getProperty("net.filebot.UserFiles.fileChooser", "Swing"));
 	}
diff --git a/source/net/filebot/ui/subtitle/SubtitleDropTarget.java b/source/net/filebot/ui/subtitle/SubtitleDropTarget.java
index 6a93bca0..329b4c23 100644
--- a/source/net/filebot/ui/subtitle/SubtitleDropTarget.java
+++ b/source/net/filebot/ui/subtitle/SubtitleDropTarget.java
@@ -33,7 +33,6 @@ import javax.swing.JDialog;
 import javax.swing.SwingUtilities;
 
 import net.filebot.ResourceManager;
-import net.filebot.Settings;
 import net.filebot.mac.MacAppUtilities;
 import net.filebot.ui.subtitle.upload.SubtitleUploadDialog;
 import net.filebot.util.FileUtilities;
@@ -170,7 +169,7 @@ abstract class SubtitleDropTarget extends JButton {
 				return false;
 			}
 
-			if (getSubtitleService().isAnonymous() && !Settings.isAppStore()) {
+			if (getSubtitleService().isAnonymous() && !isAppStore()) {
 				log.info(String.format("%s: Please enter your login details.", getSubtitleService().getName()));
 				return false;
 			}
diff --git a/source/net/filebot/ui/subtitle/SubtitlePanel.java b/source/net/filebot/ui/subtitle/SubtitlePanel.java
index 60265716..1b5535fa 100644
--- a/source/net/filebot/ui/subtitle/SubtitlePanel.java
+++ b/source/net/filebot/ui/subtitle/SubtitlePanel.java
@@ -199,7 +199,7 @@ public class SubtitlePanel extends AbstractSearchPanel<SubtitleProvider, Subtitl
 	protected SubtitleRequestProcessor createRequestProcessor() {
 		SubtitleProvider provider = searchTextField.getSelectButton().getSelectedValue();
 
-		if (provider instanceof OpenSubtitlesClient && ((OpenSubtitlesClient) provider).isAnonymous() && !Settings.isAppStore()) {
+		if (provider instanceof OpenSubtitlesClient && ((OpenSubtitlesClient) provider).isAnonymous() && !isAppStore()) {
 			log.info(String.format("%s: Please enter your login details first.", ((OpenSubtitlesClient) provider).getName()));
 
 			// automatically open login dialog