Issue #1000 - revert recent changes (#1010)

miquelbeltran · web-flow · commit a13768c457e1 · 2022-08-10T08:07:21.000+02:00
* Revert "[device_info_plus] Added more information for Windows (#814)" This reverts commit 055da82. * Issue #1000 - revert recent changes
diff --git a/packages/device_info_plus/device_info_plus/CHANGELOG.md b/packages/device_info_plus/device_info_plus/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.0.3
+
+- Reverted changes in 4.0.2
+
 ## 4.0.2
 
 - Added more information to `WindowsDeviceInfo`.
diff --git a/packages/device_info_plus/device_info_plus/example/lib/main.dart b/packages/device_info_plus/device_info_plus/example/lib/main.dart
@@ -177,28 +177,6 @@ class _MyAppState extends State<MyApp> {
       'numberOfCores': data.numberOfCores,
       'computerName': data.computerName,
       'systemMemoryInMegabytes': data.systemMemoryInMegabytes,
-      'userName': data.userName,
-      'majorVersion': data.majorVersion,
-      'minorVersion': data.minorVersion,
-      'buildNumber': data.buildNumber,
-      'platformId': data.platformId,
-      'csdVersion': data.csdVersion,
-      'servicePackMajor': data.servicePackMajor,
-      'servicePackMinor': data.servicePackMinor,
-      'suitMask': data.suitMask,
-      'productType': data.productType,
-      'reserved': data.reserved,
-      'buildLab': data.buildLab,
-      'buildLabEx': data.buildLabEx,
-      'digitalProductId': data.digitalProductId,
-      'displayVersion': data.displayVersion,
-      'editionId': data.editionId,
-      'installDate': data.installDate,
-      'productId': data.productId,
-      'productName': data.productName,
-      'registeredOwner': data.registeredOwner,
-      'releaseId': data.releaseId,
-      'deviceId': data.deviceId,
     };
   }
 
diff --git a/packages/device_info_plus/device_info_plus/pubspec.yaml b/packages/device_info_plus/device_info_plus/pubspec.yaml
@@ -1,7 +1,7 @@
 name: device_info_plus
 description: Flutter plugin providing detailed information about the device
   (make, model, etc.), and Android or iOS version the app is running on.
-version: 4.0.2
+version: 4.0.3
 homepage: https://plus.fluttercommunity.dev/
 repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/
 
@@ -25,11 +25,11 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  device_info_plus_platform_interface: ^2.4.0
+  device_info_plus_platform_interface: ^2.5.0
   device_info_plus_macos: ^2.2.3
   device_info_plus_linux: ^2.1.1
   device_info_plus_web: ^2.1.0
-  device_info_plus_windows: ^3.0.2
+  device_info_plus_windows: ^3.0.3
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/device_info_plus/device_info_plus_platform_interface/CHANGELOG.md b/packages/device_info_plus/device_info_plus_platform_interface/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.5.0
+
+- Revert 2.4.0 changes
+
 ## 2.4.0
 
 - Windows: Add userName, majorVersion, minorVersion, buildNumber, platformId, csdVersion, servicePackMajor, servicePackMinor, suitMask, productType, reserved, buildLab, buildLabEx, digitalProductId, displayVersion, editionId, installDate, productId, productName, registeredOwner, releaseId, deviceId to WindowsDeviceInfo.
diff --git a/packages/device_info_plus/device_info_plus_platform_interface/lib/model/windows_device_info.dart b/packages/device_info_plus/device_info_plus_platform_interface/lib/model/windows_device_info.dart
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:typed_data';
-
 import 'base_device_info.dart';
 
 /// Object encapsulating WINDOWS device information.
@@ -13,28 +11,6 @@ class WindowsDeviceInfo implements BaseDeviceInfo {
     required this.computerName,
     required this.numberOfCores,
     required this.systemMemoryInMegabytes,
-    required this.userName,
-    required this.majorVersion,
-    required this.minorVersion,
-    required this.buildNumber,
-    required this.platformId,
-    required this.csdVersion,
-    required this.servicePackMajor,
-    required this.servicePackMinor,
-    required this.suitMask,
-    required this.productType,
-    required this.reserved,
-    required this.buildLab,
-    required this.buildLabEx,
-    required this.digitalProductId,
-    required this.displayVersion,
-    required this.editionId,
-    required this.installDate,
-    required this.productId,
-    required this.productName,
-    required this.registeredOwner,
-    required this.releaseId,
-    required this.deviceId,
   });
 
   /// The computer's fully-qualified DNS name, where available.
@@ -47,124 +23,13 @@ class WindowsDeviceInfo implements BaseDeviceInfo {
   /// This may not be the same as available memory.
   final int systemMemoryInMegabytes;
 
-  final String userName;
-
-  /// The major version number of the operating system.
-  /// For example, for Windows 2000, the major version number is five.
-  /// For more information, see the table in Remarks.
-  /// https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/wdm/ns-wdm-_osversioninfoexw#remarks
-  final int majorVersion;
-
-  /// The minor version number of the operating system.
-  /// For example, for Windows 2000, the minor version number is zero.
-  /// For more information, see the table in Remarks.
-  /// https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/wdm/ns-wdm-_osversioninfoexw#remarks
-  final int minorVersion;
-
-  /// The build number of the operating system.
-  /// For example:
-  /// - `22000` or greater for Windows 11.
-  /// - `10240` or greator for Windows 10.
-  final int buildNumber;
-
-  /// The operating system platform.
-  /// For Win32 on NT-based operating systems, RtlGetVersion returns the value `VER_PLATFORM_WIN32_NT`.
-  final int platformId;
-
-  /// The service-pack version string.
-  /// This member contains a null-terminated string, such as "Service Pack 3", which indicates the latest service pack installed on the system.
-  /// If no service pack is installed, RtlGetVersion might not initialize this string. Initialize szCSDVersion to zero (empty string) before the call to RtlGetVersion.
-  final String csdVersion;
-
-  /// The major version number of the latest service pack installed on the system.
-  /// For example, for Service Pack 3, the major version number is three.
-  /// If no service pack has been installed, the value is zero.
-  final int servicePackMajor;
-
-  /// The minor version number of the latest service pack installed on the system.
-  /// For example, for Service Pack 3, the minor version number is zero.
-  final int servicePackMinor;
-
-  /// The product suites available on the system.
-  final int suitMask;
-
-  /// The product type. This member contains additional information about the system.
-  final int productType;
-
-  /// Reserved for future use.
-  final int reserved;
-
-  /// Value of `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\BuildLab` registry key.
-  /// For example: `22000.co_release.210604-1628`.
-  final String buildLab;
-
-  /// Value of `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\BuildLabEx` registry key.
-  /// For example: `22000.1.amd64fre.co_release.210604-1628`.
-  final String buildLabEx;
-
-  /// Value of `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\DigitalProductId` registry key.
-  final Uint8List digitalProductId;
-
-  /// Value of `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\DisplayVersion` registry key.
-  /// For example: `21H2`.
-  final String displayVersion;
-
-  /// Value of `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\EditionID` registry key.
-  final String editionId;
-
-  /// Value of `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\InstallDate` registry key.
-  final DateTime installDate;
-
-  /// Displayed as "Product ID" in Windows Settings.
-  /// Value of `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProductId` registry key.
-  /// For example: `00000-00000-0000-AAAAA`.
-  final String productId;
-
-  /// Value of `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProductName` registry key.
-  /// For example: `Windows 10 Home Single Language`.
-  final String productName;
-
-  /// Value of `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\RegisteredOwner` registry key.
-  /// For example: `Microsoft Corporation`.
-  final String registeredOwner;
-
-  /// Value of `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ReleaseId` registry key.
-  /// For example: `1903`.
-  final String releaseId;
-
-  /// Displayed as "Device ID" in Windows Settings.
-  /// Value of `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SQMClient\MachineId` registry key.
-  final String deviceId;
-
   /// Serializes [WindowsDeviceInfo] to a map.
   @override
   Map<String, dynamic> toMap() {
     return {
       'computerName': computerName,
       'numberOfCores': numberOfCores,
       'systemMemoryInMegabytes': systemMemoryInMegabytes,
-      'userName': userName,
-      'majorVersion': majorVersion,
-      'minorVersion': minorVersion,
-      'buildNumber': buildNumber,
-      'platformId': platformId,
-      'csdVersion': csdVersion,
-      'servicePackMajor': servicePackMajor,
-      'servicePackMinor': servicePackMinor,
-      'suitMask': suitMask,
-      'productType': productType,
-      'reserved': reserved,
-      'buildLab': buildLab,
-      'buildLabEx': buildLabEx,
-      'digitalProductId': digitalProductId,
-      'displayVersion': displayVersion,
-      'editionId': editionId,
-      'installDate': installDate,
-      'productId': productId,
-      'productName': productName,
-      'registeredOwner': registeredOwner,
-      'releaseId': releaseId,
-      'deviceId': deviceId,
     };
   }
 }
diff --git a/packages/device_info_plus/device_info_plus_platform_interface/pubspec.yaml b/packages/device_info_plus/device_info_plus_platform_interface/pubspec.yaml
@@ -1,6 +1,6 @@
 name: device_info_plus_platform_interface
 description: A common platform interface for the device_info_plus plugin.
-version: 2.4.0
+version: 2.5.0
 homepage: https://plus.fluttercommunity.dev/
 repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/
 
diff --git a/packages/device_info_plus/device_info_plus_platform_interface/test/model/windows_device_info_test.dart b/packages/device_info_plus/device_info_plus_platform_interface/test/model/windows_device_info_test.dart
@@ -1,4 +1,3 @@
-import 'dart:typed_data';
 import 'package:device_info_plus_platform_interface/model/windows_device_info.dart';
 import 'package:flutter_test/flutter_test.dart';
 
@@ -9,56 +8,12 @@ void main() {
         computerName: 'computerName',
         numberOfCores: 4,
         systemMemoryInMegabytes: 16,
-        userName: 'userName',
-        majorVersion: 10,
-        minorVersion: 0,
-        buildNumber: 10240,
-        platformId: 1,
-        csdVersion: 'csdVersion',
-        servicePackMajor: 1,
-        servicePackMinor: 0,
-        suitMask: 1,
-        productType: 1,
-        reserved: 1,
-        buildLab: '22000.co_release.210604-1628',
-        buildLabEx: '22000.1.amd64fre.co_release.210604-1628',
-        digitalProductId: Uint8List.fromList([]),
-        displayVersion: '21H2',
-        editionId: 'Pro',
-        installDate: DateTime(2022, 04, 02),
-        productId: '00000-00000-0000-AAAAA',
-        productName: 'Windows 10 Pro',
-        registeredOwner: 'registeredOwner',
-        releaseId: 'releaseId',
-        deviceId: 'deviceId',
       );
 
       expect(windowsDeviceInfo.toMap(), {
         'computerName': 'computerName',
         'numberOfCores': 4,
         'systemMemoryInMegabytes': 16,
-        'userName': 'userName',
-        'majorVersion': 10,
-        'minorVersion': 0,
-        'buildNumber': 10240,
-        'platformId': 1,
-        'csdVersion': 'csdVersion',
-        'servicePackMajor': 1,
-        'servicePackMinor': 0,
-        'suitMask': 1,
-        'productType': 1,
-        'reserved': 1,
-        'buildLab': '22000.co_release.210604-1628',
-        'buildLabEx': '22000.1.amd64fre.co_release.210604-1628',
-        'digitalProductId': Uint8List.fromList([]),
-        'displayVersion': '21H2',
-        'editionId': 'Pro',
-        'installDate': DateTime(2022, 04, 02),
-        'productId': '00000-00000-0000-AAAAA',
-        'productName': 'Windows 10 Pro',
-        'registeredOwner': 'registeredOwner',
-        'releaseId': 'releaseId',
-        'deviceId': 'deviceId',
       });
     });
   });
diff --git a/packages/device_info_plus/device_info_plus_windows/CHANGELOG.md b/packages/device_info_plus/device_info_plus_windows/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.0.3
+
+- Revert changes in 3.0.2
+
 ## 3.0.2
 
 - Add more information to WindowsDeviceInfo.
diff --git a/packages/device_info_plus/device_info_plus_windows/lib/src/device_info_plus_windows.dart b/packages/device_info_plus/device_info_plus_windows/lib/src/device_info_plus_windows.dart
diff --git a/packages/device_info_plus/device_info_plus_windows/pubspec.yaml b/packages/device_info_plus/device_info_plus_windows/pubspec.yaml
diff --git a/packages/device_info_plus/device_info_plus_windows/test/device_info_plus_test.dart b/packages/device_info_plus/device_info_plus_windows/test/device_info_plus_test.dart
