Repo // Remove App Tracking Transparency support.

pizza-studio · May 10, 2024 · 33bb780 · 33bb780
1 parent 4bd9188
commit 33bb780
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 77 deletions.
diff --git a/GenshinPizzaHelper.xcodeproj/project.pbxproj b/GenshinPizzaHelper.xcodeproj/project.pbxproj
@@ -17,8 +17,6 @@
 		5B4B6FFB29D421A50030501D /* DisplayOptionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B4B6FFA29D421A50030501D /* DisplayOptionsView.swift */; };
 		5B5266C02BE2B20C006C8ADF /* Flow in Frameworks */ = {isa = PBXBuildFile; productRef = 5B5266BF2BE2B20C006C8ADF /* Flow */; };
 		5B5266C22BE2B217006C8ADF /* Flow in Frameworks */ = {isa = PBXBuildFile; productRef = 5B5266C12BE2B217006C8ADF /* Flow */; };
-		5B6650592BEBE2880016588D /* AppTrackingPolicyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B6650582BEBE2880016588D /* AppTrackingPolicyView.swift */; };
-		5B66505A2BEBE2880016588D /* AppTrackingPolicyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B6650582BEBE2880016588D /* AppTrackingPolicyView.swift */; };
 		5B8C1B312AD8F3C5009F3B44 /* SFSafeSymbols in Frameworks */ = {isa = PBXBuildFile; productRef = 5B8C1B302AD8F3C5009F3B44 /* SFSafeSymbols */; };
 		5B8C1B332AD8F3DE009F3B44 /* SFSafeSymbols in Frameworks */ = {isa = PBXBuildFile; productRef = 5B8C1B322AD8F3DE009F3B44 /* SFSafeSymbols */; };
 		5B8C1B352AD9083A009F3B44 /* SFSafeSymbols in Frameworks */ = {isa = PBXBuildFile; productRef = 5B8C1B342AD9083A009F3B44 /* SFSafeSymbols */; };
@@ -826,7 +824,6 @@
 		5B4B6FFA29D421A50030501D /* DisplayOptionsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DisplayOptionsView.swift; sourceTree = "<group>"; };
 		5B4D6EB82AD1A17C00ABEF29 /* OPHelper_SharedAssembly */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = OPHelper_SharedAssembly; path = Dependences/OPHelper_SharedAssembly; sourceTree = "<group>"; };
 		5B5F82AE2ACC57F5005983AC /* ko */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; name = ko; path = ko.lproj/AccountIntents.intentdefinition; sourceTree = "<group>"; };
-		5B6650582BEBE2880016588D /* AppTrackingPolicyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppTrackingPolicyView.swift; sourceTree = "<group>"; };
 		5B918A2E29D2B3AC00F5B93D /* SwiftUIExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIExtensions.swift; sourceTree = "<group>"; };
 		5BA0D7A72ACDD3F100B4DBC2 /* ImplEnum_CharacterAsset_SwiftUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImplEnum_CharacterAsset_SwiftUI.swift; sourceTree = "<group>"; };
 		5BAF708B29E5764E0096228B /* RobotoCondensed-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "RobotoCondensed-Bold.ttf"; sourceTree = "<group>"; };
@@ -1480,7 +1477,6 @@
 				BF3F98BE28E9190700D1B5CF /* UpdateHistoryInfoView.swift */,
 				BFFD823528A680E000616CE1 /* WebImageView.swift */,
 				BF068BD428A335F9002E7334 /* WebViews.swift */,
-				5B6650582BEBE2880016588D /* AppTrackingPolicyView.swift */,
 			);
 			path = SubViews;
 			sourceTree = "<group>";
@@ -2425,7 +2421,6 @@
 				EA02810E2B79DE6C003FE7AF /* GIDictionaryModel.swift in Sources */,
 				5BD1C5D02A2A1FC90043C2B1 /* LedgerShareView.swift in Sources */,
 				5BD1C5D22A2A1FC90043C2B1 /* TextPlayerView.swift in Sources */,
-				5B66505A2BEBE2880016588D /* AppTrackingPolicyView.swift in Sources */,
 				5BD1C5D32A2A1FC90043C2B1 /* MoreView.swift in Sources */,
 				5BD1C5D42A2A1FC90043C2B1 /* AccountInfoView.swift in Sources */,
 				5BD1C5D52A2A1FC90043C2B1 /* WidgetData.swift in Sources */,
@@ -2815,7 +2810,6 @@
 				EA02810D2B79DE6C003FE7AF /* GIDictionaryModel.swift in Sources */,
 				BFE4258628A0AC1600FEFA49 /* MoreView.swift in Sources */,
 				BFE42549289F66CE00FEFA49 /* AccountInfoView.swift in Sources */,
-				5B6650592BEBE2880016588D /* AppTrackingPolicyView.swift in Sources */,
 				EA406811292228A200F23479 /* WidgetData.swift in Sources */,
 				BFE4254B289F67F600FEFA49 /* SettingsView.swift in Sources */,
 				BFFD820E28A5F64800616CE1 /* BackgroundOptions.swift in Sources */,

diff --git a/GenshinPizzaHepler/Info.plist b/GenshinPizzaHepler/Info.plist
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSUserTrackingUsageDescription</key>
-	<string>We hope to collect information about your game characters and which of them you have used in Spiral Abyss. If you agree to share your data with us, you will be able to view real-time summaries of Abyss character usage rates, team usage rates, and other related information within the app. For more details, please refer to the FAQ in the upper right corner of the Spiral Abyss page.</string>
 	<key>CFBundleIcons</key>
 	<dict>
 		<key>CFBundleAlternateIcons</key>

diff --git a/GenshinPizzaHepler/InfoPlist.xcstrings b/GenshinPizzaHepler/InfoPlist.xcstrings
@@ -274,47 +274,6 @@
           }
         }
       }
-    },
-    "NSUserTrackingUsageDescription" : {
-      "comment" : "Privacy - Tracking Usage Description",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "We hope to collect information about your game characters and which of them you have used in Spiral Abyss. If you agree to share your data with us, you will be able to view real-time summaries of Abyss character usage rates, team usage rates, and other related information within the app. For more details, please refer to the FAQ in the upper right corner of the Spiral Abyss page. The data collection only happens inside this app."
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "あなたの「ご所有のキャラ資料」と「深境螺旋でご使用していたキャラ資料」を集めようとしていますが、あなたの許可が必要です。ご許可があれば、弊アプリで集められていた「全サーバーの深境螺旋全キャラ使用率」「サーバーの深境螺旋全チーム使用率」その情報の正確性をもっと向上することはできます。それについてのよくある質問は、「深境螺旋ランキング」その画面の右上のFAQをタップしてご覧ください。データの収集はこのアプリ内部だけに発生します。"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Нам необходимо собрать информацию о персонажах, которыми вы владеете и о персонажах, которых вы использовали в Витой Бездне. Если вы разрешите собирать эти данные, вы сможете смотреть пикрейт персонажей, отрядов и прочего в Витой Бездне в реальном времени. За подробностями вы можете обратиться в ЧАВО в правом верхнем углу пикрейта Витой Бездны."
-          }
-        },
-        "vi" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Chúng tôi rất mong được thu thập các nhân vật bạn sở hữu và các nhân vật bạn đã sử dụng trong La Hoàn Thâm Cảnh . Nếu bạn cho phép chúng tôi thu thập dữ liệu, bạn có thể kiểm tra Tỷ lệ sử dụng nhân vật theo thời gian thực, Tỷ lệ sử dụng đội hình , v.v. trong ứng dụng. Để biết thêm chi tiết, bạn có thể đọc Câu hỏi thường gặp ở góc trên bên phải của Chế độ xem danh sách hàng đầu trong La Hoàn."
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "我们希望收集您已拥有的角色和在攻克深境螺旋时使用的角色。如果您同意我们使用您的战绩数据，您将可以在App内查看我们实时汇总的深境螺旋角色使用率、队伍使用率等情况。更多相关问题，请查看深境螺旋统计榜单页面右上角的 FAQ。该收集行为仅发生在该 App 内。"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "我們希望收集您已擁有的角色和在攻克深境螺旋時使用的角色。如果您同意我們使用您的戰績資料，您將可以在App內查看我們實時彙總的深境螺旋角色使用率、隊伍使用率等情況。更多相關問題，請查看深境螺旋統計榜單頁面右上角的 FAQ。該收集行為僅發生在該 App 內。"
-          }
-        }
-      }
     }
   },
   "version" : "1.0"

diff --git a/GenshinPizzaHepler/Localizable.xcstrings b/GenshinPizzaHepler/Localizable.xcstrings
@@ -44284,7 +44284,6 @@
       }
     },
     "不允许" : {
-      "extractionState" : "stale",
       "localizations" : {
         "en" : {
           "stringUnit" : {
@@ -44369,7 +44368,6 @@
       }
     },
     "允许" : {
-      "extractionState" : "stale",
       "localizations" : {
         "en" : {
           "stringUnit" : {
@@ -44559,6 +44557,34 @@
         }
       }
     },
+    "我们希望收集您已拥有的角色和在攻克深境螺旋时使用的角色。如果您同意我们使用您的数据，您将可以在App内查看我们实时汇总的深境螺旋角色使用率、队伍使用率等情况。更多相关问题，请查看深境螺旋统计榜单页面右上角的FAQ。" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "We hope to collect information about your characters and the characters you use in abyss. If you agree to share your data with us, you will be able to view real-time summaries of Abyss character usage rates, team usage rates, and other related information within the app. For more details, please refer to the FAQ in the upper right corner of the Spiral Abyss page."
+          }
+        },
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "あなたの「ご所有のキャラ資料」と「深境螺旋でご使用していたキャラ資料」を集めようとしていますが、あなたの許可が必要です。ご許可があれば、弊アプリで集められていた「全サーバーの深境螺旋全キャラ使用率」「サーバーの深境螺旋全チーム使用率」その情報の正確性をもっと向上することはできます。それについてのよくある質問は、「深境螺旋ランキング」その画面の右上のFAQをタップしてご覧ください。"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "我们希望收集您已拥有的角色和在攻克深境螺旋时使用的角色。如果您同意我们使用您的数据，您将可以在App内查看我们实时汇总的深境螺旋角色使用率、队伍使用率等情况。更多相关问题，请查看深境螺旋统计榜单页面右上角的FAQ。"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "我們希望收集您已擁有的角色和在攻克深境螺旋時使用的角色。如果您同意我們使用您的戰績資料，您將可以在App內查看我們實時彙總的深境螺旋角色使用率、隊伍使用率等情況。更多相關問題，請查看深境螺旋統計榜單頁面右上角的FAQ。"
+          }
+        }
+      }
+    },
     "抽取记录" : {
       "localizations" : {
         "en" : {
@@ -44643,6 +44669,34 @@
         }
       }
     },
+    "是否允许我们收集您的深境螺旋数据？" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Allow us collect your spiral abyss data?"
+          }
+        },
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "深境螺旋のデータの収集のご許可、よろしいですか。"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "是否允许我们收集您的深境螺旋数据？"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "是否允許我們收集您的深境螺旋數據？"
+          }
+        }
+      }
+    },
     "是否有五星" : {
       "localizations" : {
         "en" : {

diff --git a/GenshinPizzaHepler/View/DetailPortalView.swift b/GenshinPizzaHepler/View/DetailPortalView.swift
@@ -526,8 +526,25 @@ struct DetailPortalView: View {
             }
         }
         .environmentObject(vmDPV)
+        .alert(
+            "settings.privacy.abyssDataCollect",
+            isPresented: $askAllowAbyssDataCollectionAlert
+        ) {
+            Button("不允许", role: .destructive) {
+                Defaults[.allowAbyssDataCollection] = false
+                Defaults[.hasAskedAllowAbyssDataCollection] = true
+            }
+            Button("允许", role: .cancel, action: {
+                Defaults[.allowAbyssDataCollection] = true
+                Defaults[.hasAskedAllowAbyssDataCollection] = true
+            })
+        } message: {
+            Text("settings.privacy.abyssDataCollect.detail")
+        }
         .onAppear {
-            AppConfig.requestConsentForSpiralAbyssDataUpload()
+            if !Defaults[.hasAskedAllowAbyssDataCollection] {
+                askAllowAbyssDataCollectionAlert = true
+            }
         }
     }
 

diff --git a/GenshinPizzaHepler/View/SubViews/AppTrackingPolicyView.swift b/GenshinPizzaHepler/View/SubViews/AppTrackingPolicyView.swift