From 736d8fdc76640ea112a2145fd7b51cea491ddca1 Mon Sep 17 00:00:00 2001
From: Daniel Kononov <daniel.kononov@relution.io>
Date: Mon, 21 Oct 2024 10:51:21 +0200
Subject: [PATCH 1/5] REL-6078: add privacy manifest to darwin

---
 .idea/workspace.xml                    | 62 +++++++++++++++++++++-----
 darwin/Resources/PrivacyInfo.xcprivacy | 26 +++++++++++
 darwin/managed_configurations.podspec  |  1 +
 3 files changed, 77 insertions(+), 12 deletions(-)
 create mode 100644 darwin/Resources/PrivacyInfo.xcprivacy

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5cc5414..07d8c1f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="cc3f3570-3366-4add-8bf0-d849236045f8" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/darwin/Resources/PrivacyInfo.xcprivacy" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/darwin/managed_configurations.podspec" beforeDir="false" afterPath="$PROJECT_DIR$/darwin/managed_configurations.podspec" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
   <component name="FileEditorManager">
     <leaf>
       <file leaf-file-name="managed_configurations.dart" pinned="false" current-in-tab="true">
@@ -22,24 +36,48 @@
       </file>
     </leaf>
   </component>
-  <component name="ToolWindowManager">
-    <editor active="true" />
-    <layout>
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-    </layout>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-    </navigator>
+    <navigator currentView="ProjectPane" proportions="" version="1" />
     <panes>
       <pane id="ProjectPane">
         <option name="show-excluded-files" value="false" />
       </pane>
     </panes>
   </component>
-  <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="dart.analysis.tool.window.force.activate" value="true" />
-    <property name="show.migrate.to.gradle.popup" value="false" />
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "dart.analysis.tool.window.visible": "false",
+    "git-widget-placeholder": "feature/REL-6078__maintain",
+    "last_opened_file_path": "/Users/danielkononov/development/work-repos/flutter-managed-configuration/darwin",
+    "node.js.selected.package.tslint": "(autodetect)"
+  }
+}]]></component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/darwin" />
+    </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/darwin/Resources" />
+    </key>
+  </component>
+  <component name="TaskManager">
+    <servers />
+  </component>
+  <component name="ToolWindowManager">
+    <editor active="true" />
+    <layout>
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+    </layout>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <option name="LAST_COMMIT_MESSAGE" value="" />
+  </component>
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/darwin/Resources/PrivacyInfo.xcprivacy b/darwin/Resources/PrivacyInfo.xcprivacy
new file mode 100644
index 0000000..ee81a11
--- /dev/null
+++ b/darwin/Resources/PrivacyInfo.xcprivacy
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>NSPrivacyTracking</key>
+        <false/>
+        <key>NSPrivacyTrackingDomains</key>
+        <array>
+        </array>
+        <key>NSPrivacyCollectedDataTypes</key>
+        <array>
+        </array>
+        <key>NSPrivacyAccessedAPITypes</key>
+        <array>
+                <dict>
+                        <key>NSPrivacyAccessedAPIType</key>
+                        <string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+                        <key>NSPrivacyAccessedAPITypeReasons</key>
+                        <array>
+                                <string>AC6B.1</string>
+                        </array>
+                </dict>
+        </array>
+</dict>
+</plist>
+
diff --git a/darwin/managed_configurations.podspec b/darwin/managed_configurations.podspec
index e51e531..de9c727 100644
--- a/darwin/managed_configurations.podspec
+++ b/darwin/managed_configurations.podspec
@@ -14,6 +14,7 @@ A new flutter plugin project.
   s.author           = { 'Your Company' => 'email@example.com' }
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
+  s.resource_bundles = {'package_name_privacy' => ['Resources/PrivacyInfo.xcprivacy']}
   
   s.platform = :ios, '9.0'
   s.platform = :osx, '10.11'

From c14b5a9e52f1f0c3288799166c5ec941617c01a1 Mon Sep 17 00:00:00 2001
From: Daniel Kononov <daniel.kononov@relution.io>
Date: Mon, 21 Oct 2024 13:57:59 +0200
Subject: [PATCH 2/5] REL-6078: update Readme

---
 README.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4ddbbe6..cc4f474 100644
--- a/README.md
+++ b/README.md
@@ -7,13 +7,25 @@ Provides a method and a stream which calls on managed app configuration changes.
 
 ## Additional Information
 
+### Android:
+
 https://developer.android.com/work/managed-configurations
 
-### Test on Android:
+#### How to Test
 It could be that you need to factory reset your android device before installing TestDPC for testing.
 * https://github.com/googlesamples/android-testdpc
 * https://developer.android.com/work/guide#testing
 
+### iOS/macOS
+https://developer.apple.com/documentation/foundation/nsuserdefaults#2926901
+
+#### How to Test
+
+Apple does not provide a dev environment to test managed app configuration so you will need to use one of the available 
+MDM provider. This package was created to work with [Relution](https://relution.io).
+You can create a free Account and enroll up to 5 devices to test your implementation.
+
+For more information check out the documentation of the used MDM provider how to add managed app configuration to your app.
 
 ## How to use
 

From e85c9792a7b805df09faf0153b3c83b7d1392906 Mon Sep 17 00:00:00 2001
From: Daniel Kononov <daniel.kononov@relution.io>
Date: Mon, 21 Oct 2024 13:58:08 +0200
Subject: [PATCH 3/5] REL-6078: fix spelling

---
 darwin/Classes/ManagedConfigurationsPlugin.swift | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/darwin/Classes/ManagedConfigurationsPlugin.swift b/darwin/Classes/ManagedConfigurationsPlugin.swift
index 9d42055..48c0e67 100644
--- a/darwin/Classes/ManagedConfigurationsPlugin.swift
+++ b/darwin/Classes/ManagedConfigurationsPlugin.swift
@@ -38,7 +38,7 @@ public class ManagedConfigurationsPlugin: NSObject, FlutterPlugin {
   }
     
     /**
-    Handles the getManagedConfiguration method ivoked by flutter side.
+    Handles the getManagedConfiguration method invoked by flutter side.
     Writes the managed configuration in the result as json converted to String
      If something fails returns empty json string ("{}")
      */
@@ -63,7 +63,7 @@ public class ManagedConfigurationsPlugin: NSObject, FlutterPlugin {
  Used to handle the Event channel
  On Flutter stream subscribe creates an observer on UsersDefault.
  Calls on changes the mdConfigChange method
- Its not necassary to remove this observer as it will anyway removed if not used
+ Its not necessary to remove this observer as it will anyway removed if not used
  */
 class SwiftStreamHandler: NSObject, FlutterStreamHandler {
     /// save the sink as we need it to put the changes in it
@@ -81,7 +81,7 @@ class SwiftStreamHandler: NSObject, FlutterStreamHandler {
     }
     
     /**
-     handles the notification if something happend on UserDefaults
+     handles the notification if something happened on UserDefaults
      Extracts the managed configuration and converts them to json String. Checks if something changed.
      If so, puts in the sink (Flutter side will be notified)
      */
@@ -90,7 +90,6 @@ class SwiftStreamHandler: NSObject, FlutterStreamHandler {
            let jsonData = try? JSONSerialization.data(withJSONObject: managedConf, options: .prettyPrinted),
            let jsonString = String(data: jsonData, encoding: .utf8),
            let events = eventsVariable{
-            print("calling dies das")
             if lastJsonString == nil {
                 lastJsonString = jsonString
                 events(jsonString)

From ac028a4aca9f41aa632ea823bf85f79501e945ca Mon Sep 17 00:00:00 2001
From: Daniel Kononov <daniel.kononov@relution.io>
Date: Tue, 22 Oct 2024 12:15:08 +0200
Subject: [PATCH 4/5] REL-6078: update gradle und kotlin version

---
 android/build.gradle | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 6878afc..f0c902a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,14 +2,14 @@ group 'io.mway.managed_configurations'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.9.21'
+    ext.kotlin_version = '2.0.20'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:8.7.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -17,7 +17,7 @@ buildscript {
 rootProject.allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
@@ -28,12 +28,13 @@ android {
     if (project.android.hasProperty('namespace')) {
         namespace 'io.mway.managed_configurations'
     }
-    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
+
     defaultConfig {
+        compileSdk 31
         minSdkVersion 21
     }
 
@@ -44,7 +45,6 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'com.google.code.gson:gson:2.11.0'
     implementation 'androidx.enterprise:enterprise-feedback:1.1.0'
 }

From 018a6f843f520806ce65de27c28d5facb556ef07 Mon Sep 17 00:00:00 2001
From: danielkono <54840789+danielkono@users.noreply.github.com>
Date: Tue, 22 Oct 2024 13:55:44 +0200
Subject: [PATCH 5/5] Delete .idea/workspace.xml

---
 .idea/workspace.xml | 83 ---------------------------------------------
 1 file changed, 83 deletions(-)
 delete mode 100644 .idea/workspace.xml

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 07d8c1f..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="cc3f3570-3366-4add-8bf0-d849236045f8" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/darwin/Resources/PrivacyInfo.xcprivacy" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/darwin/managed_configurations.podspec" beforeDir="false" afterPath="$PROJECT_DIR$/darwin/managed_configurations.podspec" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="managed_configurations.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/managed_configurations.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1" />
-    <panes>
-      <pane id="ProjectPane">
-        <option name="show-excluded-files" value="false" />
-      </pane>
-    </panes>
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "dart.analysis.tool.window.visible": "false",
-    "git-widget-placeholder": "feature/REL-6078__maintain",
-    "last_opened_file_path": "/Users/danielkononov/development/work-repos/flutter-managed-configuration/darwin",
-    "node.js.selected.package.tslint": "(autodetect)"
-  }
-}]]></component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/darwin" />
-    </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/darwin/Resources" />
-    </key>
-  </component>
-  <component name="TaskManager">
-    <servers />
-  </component>
-  <component name="ToolWindowManager">
-    <editor active="true" />
-    <layout>
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-    </layout>
-  </component>
-  <component name="VcsManagerConfiguration">
-    <option name="LAST_COMMIT_MESSAGE" value="" />
-  </component>
-  <component name="XSLT-Support.FileAssociations.UIState">
-    <expand />
-    <select />
-  </component>
-</project>
\ No newline at end of file