Merge branch 'master' into chore/common/10183-unicode-version

oem/firstvoices/android/app/build.gradle

@@ -121,7 +121,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.12.0'
     api(name: 'keyman-engine', ext: 'aar')
-    implementation 'io.sentry:sentry-android:7.8.0'
+    implementation 'io.sentry:sentry-android:6.9.2'
     implementation 'androidx.preference:preference:1.2.1'
 }
 

oem/firstvoices/android/build.gradle

@@ -7,7 +7,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath 'io.sentry:sentry-android-gradle-plugin:4.6.0'
+        classpath 'io.sentry:sentry-android-gradle-plugin:2.1.2'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

windows/src/desktop/kmshell/util/Keyman.System.KeymanStartTask.pas

@@ -11,7 +11,6 @@ interface
   TKeymanStartTask = class
   private
     class function GetTaskName: string;
-    class procedure CleanupAlphaTasks(pTaskFolder: ITaskFolder); static;
   {$IF FALSE}
     //Disabled to avoid hint during build; re-enable if wanting to
     //re-establish the task model
@@ -115,15 +114,6 @@ class procedure TKeymanStartTask.CreateTask;
     end;
   end;
 
-  try
-    CleanupAlphaTasks(pTaskFolder);
-  except
-    on E:Exception do
-    begin
-      TKeymanSentryClient.ReportHandledException(E, 'Failed to cleanup alpha tasks');
-    end;
-  end;
-
   try
     // Create a new task
     pTask := pService.NewTask(0);
@@ -228,8 +218,6 @@ class procedure TKeymanStartTask.DeleteTask;
       end;
     end;
 
-    CleanupAlphaTasks(pTaskFolder);
-
     if pTaskFolder.GetTasks(0).Count = 0 then
     begin
       pTaskFolder := nil;
@@ -260,36 +248,4 @@ class procedure TKeymanStartTask.RecreateTask;
   CreateTask;
 end;
 
-class procedure TKeymanStartTask.CleanupAlphaTasks(pTaskFolder: ITaskFolder);
-var
-  tasks: IRegisteredTaskCollection;
-  i: Integer;
-begin
-  // Cleanup earlier alpha-version tasks: we renamed the task to include the
-  // user's login name in build 14.0.194 of Keyman, so that multiple users could
-  // create the task on the same machine. It's not obvious, but the Tasks
-  // namespace is shared between all users -- non-admin users will not be able
-  // to see or overwrite tasks created by other users; they'd just get a
-  // (silent) access denied result.
-  try
-    tasks := pTaskFolder.GetTasks(0);
-    for i := 1 to tasks.Count do
-      if SameText(tasks.Item[i].Name, CTaskName) then
-      begin
-        tasks := nil;
-        pTaskFolder.DeleteTask(CTaskName, 0);
-        Exit;
-      end;
-  except
-    on E:EOleException do
-    begin
-      if (E.ErrorCode <> HResultFromWin32(ERROR_FILE_NOT_FOUND)) and
-        (E.ErrorCode <> HResultFromWin32(ERROR_ACCESS_DENIED)) then
-        // We ignore when the task doesn't exist, but report other errors
-        TKeymanSentryClient.ReportHandledException(E, 'Failed to delete task '+CTaskName);
-    end;
-  end;
-end;
-
-
 end.