Merge pull request #2 from hanlim83/master

Updated Zoom Presence Detection Methods As well as Updated Dependencies
book000 · Jul 10, 2021 · 34dfe3e · 34dfe3e
2 parents 80296ff + fbb4808
commit 34dfe3e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/ZoomInClass/App.config b/ZoomInClass/App.config
@@ -1,6 +1,14 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
     </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/ZoomInClass/Form1.cs b/ZoomInClass/Form1.cs
@@ -47,23 +47,15 @@ void Deinitialize()
         private void timer1_Tick(object sender, EventArgs e)
         {
             Process[] ps = Process.GetProcesses();
-            Boolean isZoomClassing = false;
+            bool isZoomClassing = false;
             foreach (Process p in ps)
             {
                 try
                 {
-                    if (!p.ProcessName.Equals("Zoom"))
-                    {
-                        continue;
-                    }
-
-                    if (!p.MainWindowTitle.Equals("Zoom ミーティング") && !p.MainWindowTitle.Equals("Zoom Meetings") &&
-                        !p.MainWindowTitle.Equals("Zoom Meeting") && !p.MainWindowTitle.Equals("Zoom"))
-                    {
-                        continue;
-                    }
-
-                    isZoomClassing = true;
+                    if ((p.MainWindowTitle.Contains("Zoom Meeting") || p.MainWindowTitle.Contains("Zoom Webinar") || p.ProcessName.Equals("CptHost")) && !p.ProcessName.Equals("ZoomInClass"))
+                        isZoomClassing = true;
+                    else
+                        isZoomClassing = false;
                 }
                 catch (Exception ex)
                 {

diff --git a/ZoomInClass/ZoomInClass.csproj b/ZoomInClass/ZoomInClass.csproj
@@ -33,11 +33,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DiscordRPC, Version=1.0.169.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DiscordRichPresence.1.0.169\lib\net35\DiscordRPC.dll</HintPath>
+    <Reference Include="DiscordRPC, Version=1.0.175.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DiscordRichPresence.1.0.175\lib\net35\DiscordRPC.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/ZoomInClass/packages.config b/ZoomInClass/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DiscordRichPresence" version="1.0.169" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
+  <package id="DiscordRichPresence" version="1.0.175" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
 </packages>