app-info 3.0.0.beta4 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f280bf2b7d24887596063969a7491b89d799c39cabdd6a8149beb9d20554d73
-  data.tar.gz: 0a12bb443128045426a2de2c308e4d750e3269ed913d609e7546a3ec768cd6c6
+  metadata.gz: 0f0d48c631471efcf9aad2bf89dcb171433cea5babd6e90be71e839c924449d7
+  data.tar.gz: 36cdb280cb149defbd1171713c33dc268b5eb371aeeaff9009b8bd1f3b90ca7d
 SHA512:
-  metadata.gz: 144909595cce9cd8706b3e36cc2162ae61da7b4982bb06f7ba77f906473d05db7b3e67a6d86e0258911226251eab8db910f3e84c4746a8961746770fbd39cdbe
-  data.tar.gz: 04fbe3e5c61dded451319c6b1183ef3e1e48e1ae6297152a1354093697a2a562916f7360fbf4fc340d62864d45be11b8731fc32e43e482e81d953f06aa744f65
+  metadata.gz: 35120ee87f3b97cf1fc808f9960a0e1082558ca101e78c00082e883446263422eb6694e591602941f004e6cf1674a4f5c1b47752418ae78eff6a37f22c5bcf4c
+  data.tar.gz: eede9fef6333ead33d4a4ffd550ca6525ace8e94f6beaab9d66f06af0a65a6ce220ab8dcf9f40dedf1660b0bbacba9408ed8bda11d177a9a1a1ad491a9d3be0b

data/.github/workflows/ci.yml

@@ -9,35 +9,21 @@ on:
 
 jobs:
   test:
-    runs-on: ${{ matrix.os }}
-
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ ruby-2.5, ruby-2.6, ruby-2.7, ruby-3.0, ruby-3.1, ruby-3.2 ]
+        ruby: [ ruby-3.1, ruby-3.2, ruby-3.3 ]
         os: [ ubuntu-latest ]
 
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - name: bundle exec rspec
-        run: bundle exec rspec --format progress --force-colour
-
-  lint:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
-      - name: bundle exec rubocop
-        run: bundle exec rubocop --format progress --color
+      - name: bundle exec rake
+        run: bundle exec rake

data/.github/workflows/create_release.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Create Release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       if: startsWith(github.ref, 'refs/tags/')
       with:
         files: CHANGELOG.md

data/CHANGELOG.md

@@ -9,6 +9,40 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 > List all changes before release a new version.
 
+## [3.1.0] (2024-06-24)
+
+Dropped Ruby 2.5 ~ 3.0 support (no changes required.).
+
+### Added
+
+- Add Apple TV parser support.
+- Add `.url_schemes`, `.query_schemes` and `.background_modes` to ipa and info_plist parser.
+- Upgrade Android AAPT2 to 2.19.
+
+## [3.0.0] (2023-04-18)
+
+### Added
+
+- New Windows PE format parser. [#47](https://github.com/icyleaf/app_info/pull/47)
+- Android parser add v2, v3 scheme signature support. [#55](https://github.com/icyleaf/app_info/pull/55]
+- dSYM parer accept multi dSYM target in a zip file. [#56](https://github.com/icyleaf/app_info/pull/56)
+- Better document for yardoc.
+- Android parser `.icons` method add exclude param to filter icons.
+- Add `.files` method to proguard parser.
+
+### Changed
+
+- Add `AppInfo::File` base class for all parsers.
+- Add `AppInfo::Certifiate` X509 certificate wrapped and apply in Android/MobileProvision.
+- Re-organize categories `.platform`  to `.manufacturer`, `.platform` and `.device` for all parsers.
+- Remove `.sign_version` method in Android parser.
+- Rename `.file_type` to `.format` method in all parers and return a `AppInfo::Format` type.
+- Remove duplice `AppInfo::AndroidDevice` class.
+- Remove `AppInfo::MobileProvision::DeveloperCertificate` class, use `AppInfo::Certifiate` instead.
+- Deprecate `.signs` and `.certifiates` methods in Android parser, use `.signatures` instead.
+- Deprecate `.developer_certs` method in MobileProvision parser, use `.certificates` instead.
+- Change ExportType values type to symbol both IPA and macOS parsers. [#58](https://github.com/icyleaf/app_info/pull/58)
+
 ## [3.0.0.beta4] (2023-04-11)
 
 ### Added
@@ -302,7 +336,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Updated dependency of CFPropertly list be a range between 2.3.4. (thanks @[cschroed](https://github.com/cschroed))
 
-[Unreleased]: https://github.com/icyleaf/app-info/compare/v3.0.0.beta4..HEAD
+[Unreleased]: https://github.com/icyleaf/app-info/compare/v3.1.0..HEAD
+[3.1.0]: https://github.com/icyleaf/app-info/compare/v3.0.0...v3.1.0
+[3.0.0]: https://github.com/icyleaf/app-info/compare/v2.8.5...v3.0.0
 [3.0.0.beta4]: https://github.com/icyleaf/app-info/compare/v3.0.0.beta3...v3.0.0.beta4
 [3.0.0.beta3]: https://github.com/icyleaf/app-info/compare/v3.0.0.beta2...v3.0.0.beta3
 [3.0.0.beta2]: https://github.com/icyleaf/app-info/compare/v3.0.0.beta1...v3.0.0.beta2

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 
 group :development do
   gem 'awesome_print'
-  gem 'debug' # For ruby 3.0+\
+  gem 'debug' # For ruby 3.0+
   gem 'yard'
 end
 

data/README.md

@@ -1,6 +1,6 @@
 # app-info
 
-[![Language](https://img.shields.io/badge/ruby-2.5+-701516)](.github/workflows/ci.yml)
+[![Language](https://img.shields.io/badge/ruby-3.1+-701516)](.github/workflows/ci.yml)
 [![Gem version](https://img.shields.io/gem/v/app-info?include_prereleases)](https://rubygems.org/gems/app-info)
 [![Build Status](https://img.shields.io/github/actions/workflow/status/icyleaf/app_info/ci.yml)](https://github.com/icyleaf/app_info/actions/workflows/ci.yml)
 [![License](https://img.shields.io/github/license/icyleaf/app-info)](LICENSE)
@@ -13,7 +13,7 @@ Analysis metedata like version, name, icon etc.
 - Android file
   - `.apk`
   - `.aab` (Androld App Bundle)
-- iOS file
+- iOS, Apple TV file
   - `.ipa`
   - `Info.plist` file
   - `.mobileprovision`/`.provisionprofile` file
@@ -64,6 +64,7 @@ require 'app-info'
 # Automatic detect file extsion and parse
 parser = AppInfo.parse('iphone.ipa')
 parser = AppInfo.parse('ipad.ipa')
+parser = AppInfo.parse('apple-tv.ipa')
 parser = AppInfo.parse('android.apk')
 parser = AppInfo.parse('android.aab')
 parser = AppInfo.parse('u-u-i-d.mobileprovision')
@@ -73,7 +74,7 @@ parser = AppInfo.parse('win.exe')
 parser = AppInfo.parse('win.zip')
 
 # If detect file type failed, you can parse in other way
-parser = AppInfo::IPA.new('iphone.ipa')
+parser = AppInfo::IPA.new('iphone-ipad-unversal-appletv.ipa')
 parser = AppInfo::APK.new('android.apk')
 parser = AppInfo::AAB.new('android.aab')
 parser = AppInfo::InfoPlist.new('Info.plist')
@@ -85,10 +86,10 @@ parser = AppInfo::PE.new('win.exe')
 
 ### iOS
 
-Teardown suport iPhone/iPad/Universal.
+Teardown suport iPhone, iPad, Universal and Apple TV file.
 
 ```ruby
-ipa = AppInfo.parse('iphone.ipa')
+ipa = AppInfo.parse('iphone-ipad-unversal-appletv.ipa')
 
 # get app file size
 ipa.size
@@ -118,6 +119,7 @@ ipa.devices
 ipa.ipad?
 ipa.iphone?
 ipa.universal?
+ipa.appletv?
 
 # detect app release type
 ipa.release_type
@@ -135,6 +137,18 @@ ipa.frameworks
 ipa.plugins
 # => [<AppInfo::Plugin:1680 @name=NotificationService>]
 
+# get url schemes
+ipa.url_schemes
+# => [{:name=>"Web", :role=>"Editor", :schemes=>["app-info", "app_info"]}]
+
+# get query schemes
+ipa.url_schemes
+# => ["twitter", "instagram", "www-x-callback"]
+
+# get background modes
+ipa.background_modes
+# => ["audio", "fetch", "remote-notification"]
+
 # get more propety in Info.plist
 ipa.info[:CFBundleDisplayName]
 # => 'AppInfoDemo'

data/Rakefile

@@ -2,16 +2,17 @@
 
 $LOAD_PATH.unshift File.expand_path('lib', __dir__)
 require 'app_info'
-require 'yard'
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+task default: %w[spec rubocop]
 
 task :doc do
+  require 'yard'
+
   YARD::Rake::YardocTask.new do |t|
     t.files   = ['lib/**/*.rb', 'README.md', 'LICENSE']
     # t.options = ['--any', '--extra', '--opts'] # optional
@@ -19,4 +20,6 @@ task :doc do
   end
 end
 
-
+task :rubocop do
+  RuboCop::RakeTask.new
+end

data/app_info.gemspec

@@ -18,17 +18,19 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 3.1'
 
   spec.add_dependency 'CFPropertyList', '< 3.1.0', '>= 2.3.4'
-  spec.add_dependency 'image_size', '>= 1.5', '< 3.3'
-  spec.add_dependency 'ruby-macho', '>= 1.4', '< 4'
+  spec.add_dependency 'nkf', '~> 0.2.0'
+  spec.add_dependency 'base64', '~> 0.2.0'
+  spec.add_dependency 'image_size', '>= 1.5', '< 3.5'
+  spec.add_dependency 'ruby-macho', '>= 1.4', '< 5'
   spec.add_dependency 'android_parser', '~> 2.6.0'
   spec.add_dependency 'rubyzip', '>= 1.2', '< 3.0'
   spec.add_dependency 'uuidtools', '>= 2.1.5', '< 2.3.0'
   spec.add_dependency 'icns', '~> 0.2.0'
   spec.add_dependency 'pedump', '~> 0.6.2'
-  spec.add_dependency 'google-protobuf', '>= 3.19.4', '< 3.23.0'
+  spec.add_dependency 'google-protobuf', '>= 4.27.1', '< 5.0.0'
 
   spec.add_development_dependency 'bundler', '>= 1.12'
   spec.add_development_dependency 'rake', '>= 10.0'

data/lib/app_info/apple.rb

@@ -72,9 +72,10 @@ module AppInfo
     #   @see InfoPlist#min_sdk_version
     # @!method min_os_version
     #   @see InfoPlist#min_os_version
-    def_delegators :info, :device, :platform, :iphone?, :ipad?, :universal?, :macos?,
+    def_delegators :info, :device, :platform, :iphone?, :ipad?, :universal?, :macos?, :appletv?,
                    :build_version, :name, :release_version, :identifier, :bundle_id,
-                   :display_name, :bundle_name, :min_sdk_version, :min_os_version
+                   :display_name, :bundle_name, :min_sdk_version, :min_os_version,
+                   :url_schemes, :query_schemes, :background_modes
 
     # @!method devices
     #   @see MobileProvision#devices

data/lib/app_info/const.rb

@@ -42,6 +42,7 @@ module AppInfo
     MACOS = :macos
     IOS = :ios
     ANDROID = :android
+    APPLETV = :appletv
     WINDOWS = :windows
   end
 
@@ -54,14 +55,16 @@ module AppInfo
     IPHONE = :iphone
     # Apple iPad
     IPAD = :ipad
-    # Apple Watch
-    IWATCH = :iwatch # not implemented yet
     # Apple Universal (iPhone and iPad)
     UNIVERSAL = :universal
+    # Apple TV
+    APPLETV = :appletv
+    # Apple Watch (TODO: not implemented yet)
+    IWATCH = :iwatch
 
     # Android Phone
     PHONE = :phone
-    # Android Tablet (not implemented yet)
+    # Android Tablet (TODO: not implemented yet)
     TABLET = :tablet
     # Android Watch
     WATCH = :watch

data/lib/app_info/info_plist.rb

@@ -29,6 +29,8 @@ module AppInfo
         Platform::MACOS
       when Device::IPHONE, Device::IPAD, Device::UNIVERSAL
         Platform::IOS
+      when Device::APPLETV
+        Platform::APPLETV
       end
     end
 
@@ -40,6 +42,10 @@ module AppInfo
         Device::IPAD
       elsif device_family == [1, 2]
         Device::UNIVERSAL
+      elsif device_family == [3]
+        Device::APPLETV
+      elsif device_family == [6]
+        Device::APPMACOSLETV
       elsif !info.try(:[], 'DTSDKName').nil? || !info.try(:[], 'DTManufacturerName').nil?
         Device::MACOS
       else
@@ -125,6 +131,11 @@ module AppInfo
       device == Device::MACOS
     end
 
+    # @return [Boolean]
+    def appletv?
+      device == Device::APPLETV
+    end
+
     # @return [Array<String>]
     def device_family
       info.try(:[], 'UIDeviceFamily') || []
@@ -139,6 +150,37 @@ module AppInfo
       end
     end
 
+    # A list of URL schemes (http, ftp, and so on) supported by the app.
+    #
+    # @return [Array<String>]
+    def url_schemes
+      url_types = info.try(:[], 'CFBundleURLTypes')
+      return [] unless url_types
+
+      url_types.each_with_object([]) do |url_type, obj|
+        data = {
+          role: url_type['CFBundleTypeRole'],
+          name: url_type['CFBundleURLName'],
+          schemes: url_type['CFBundleURLSchemes']
+        }
+        obj << data
+      end
+    end
+
+    # Specifies the URL schemes you want the app to be able to use
+    #
+    # @return [Array<String>]
+    def query_schemes
+      info.try(:[], 'LSApplicationQueriesSchemes') || []
+    end
+
+    # Services provided by an app that require it to run in the background
+    #
+    # @return [Array<String>]
+    def background_modes
+      info.try(:[], 'UIBackgroundModes') || []
+    end
+
     # @return [String, nil]
     def [](key)
       info.try(:[], key.to_s)

data/lib/app_info/ipa.rb

@@ -9,7 +9,7 @@ module AppInfo
   class IPA < Apple
     # Full icons metadata
     # @example
-    #   aab.icons
+    #   ipa.icons
     #   # => [
     #   #   {
     #   #     name: 'icon.png',
@@ -46,12 +46,13 @@ module AppInfo
       @frameworks ||= Framework.parse(app_path)
     end
 
+    DEFAULT_MOBILEPROVISION_FILE = 'embedded.mobileprovision'
+
     # @return [String]
     def mobileprovision_path
-      filename = 'embedded.mobileprovision'
-      @mobileprovision_path ||= ::File.join(@file, filename)
+      @mobileprovision_path ||= ::File.join(@file, DEFAULT_MOBILEPROVISION_FILE)
       unless ::File.exist?(@mobileprovision_path)
-        @mobileprovision_path = ::File.join(app_path, filename)
+        @mobileprovision_path = ::File.join(app_path, DEFAULT_MOBILEPROVISION_FILE)
       end
 
       @mobileprovision_path
@@ -148,7 +149,7 @@ module AppInfo
 
     def icon_keys
       @icon_keys ||= case device
-                     when Device::IPHONE
+                     when Device::IPHONE, Device::APPLETV
                        [IPHONE_KEY]
                      when Device::IPAD
                        [IPAD_KEY]

data/lib/app_info/macos.rb

@@ -124,7 +124,7 @@ module AppInfo
       data[:sets] ||= []
       file = data[:file]
       reader = Icns::Reader.new(file)
-      Icns::SIZE_TO_TYPE.each do |size, _|
+      Icns::SIZE_TO_TYPE.each_key do |size|
         dest_filename = "#{::File.basename(file, '.icns')}_#{size}x#{size}.png"
         dest_file = tempdir(::File.join(::File.dirname(file), dest_filename), prefix: 'converted')
         next unless icon_data = reader.image(size: size)

data/lib/app_info/mobile_provision.rb

@@ -39,7 +39,8 @@ module AppInfo
       return :development if development?
       return :adhoc if adhoc?
       return :appstore if appstore?
-      return :enterprise if enterprise?
+
+      :enterprise if enterprise?
     end
 
     # @return [Array<Symbol>]
@@ -159,7 +160,7 @@ module AppInfo
       capabilities = []
       capabilities << 'In-App Purchase' << 'GameKit' if adhoc? || appstore?
 
-      entitlements.each do |key, _|
+      entitlements.each_key do |key|
         case key
         when 'aps-environment'
           capabilities << 'Push Notifications'

data/lib/app_info/pe.rb

@@ -199,7 +199,7 @@ module AppInfo
         zip_entry.extract(exe_file)
         zip_file.close
 
-        return exe_file
+        exe_file
       }.call
     end
 

data/lib/app_info/protobuf/manifest.rb

@@ -166,7 +166,7 @@ module AppInfo
             obj << intent_filters
           else
             intent_filters.each do |filter|
-              exist_method = "#{search}?".to_sym
+              exist_method = :"#{search}?"
               next if filter.respond_to?(exist_method) && !filter.send(exist_method)
 
               obj << filter.send(search)
@@ -188,7 +188,7 @@ module AppInfo
         CATEGORY_BROWSABLE = 'android.intent.category.BROWSABLE'
 
         def deep_links?
-          return unless respond_to?(:data)
+          return false unless respond_to?(:data)
 
           browsable? && data.any? { |d| DEEP_LINK_SCHEMES.include?(d.scheme) }
         end
@@ -202,7 +202,7 @@ module AppInfo
         end
 
         def schemes?
-          return unless respond_to?(:data)
+          return false unless respond_to?(:data)
 
           browsable? && data.any? { |d| !DEEP_LINK_SCHEMES.include?(d.scheme) }
         end

data/lib/app_info/protobuf/models/Configuration.proto

@@ -13,13 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 syntax = "proto3";
-
 package aapt.pb;
-
 option java_package = "com.android.aapt";
-
 // A description of the requirements a device must have in order for a
 // resource to be matched and selected.
 message Configuration {
@@ -28,7 +24,6 @@ message Configuration {
     LAYOUT_DIRECTION_LTR = 1;
     LAYOUT_DIRECTION_RTL = 2;
   }
-
   enum ScreenLayoutSize {
     SCREEN_LAYOUT_SIZE_UNSET = 0;
     SCREEN_LAYOUT_SIZE_SMALL = 1;
@@ -36,38 +31,32 @@ message Configuration {
     SCREEN_LAYOUT_SIZE_LARGE = 3;
     SCREEN_LAYOUT_SIZE_XLARGE = 4;
   }
-
   enum ScreenLayoutLong {
     SCREEN_LAYOUT_LONG_UNSET = 0;
     SCREEN_LAYOUT_LONG_LONG = 1;
     SCREEN_LAYOUT_LONG_NOTLONG = 2;
   }
-
   enum ScreenRound {
     SCREEN_ROUND_UNSET = 0;
     SCREEN_ROUND_ROUND = 1;
     SCREEN_ROUND_NOTROUND = 2;
   }
-
   enum WideColorGamut {
     WIDE_COLOR_GAMUT_UNSET = 0;
     WIDE_COLOR_GAMUT_WIDECG = 1;
     WIDE_COLOR_GAMUT_NOWIDECG = 2;
   }
-
   enum Hdr {
     HDR_UNSET = 0;
     HDR_HIGHDR = 1;
     HDR_LOWDR = 2;
   }
-
   enum Orientation {
     ORIENTATION_UNSET = 0;
     ORIENTATION_PORT = 1;
     ORIENTATION_LAND = 2;
     ORIENTATION_SQUARE = 3;
   }
-
   enum UiModeType {
     UI_MODE_TYPE_UNSET = 0;
     UI_MODE_TYPE_NORMAL = 1;
@@ -78,40 +67,34 @@ message Configuration {
     UI_MODE_TYPE_WATCH = 6;
     UI_MODE_TYPE_VRHEADSET = 7;
   }
-
   enum UiModeNight {
     UI_MODE_NIGHT_UNSET = 0;
     UI_MODE_NIGHT_NIGHT = 1;
     UI_MODE_NIGHT_NOTNIGHT = 2;
   }
-
   enum Touchscreen {
     TOUCHSCREEN_UNSET = 0;
     TOUCHSCREEN_NOTOUCH = 1;
     TOUCHSCREEN_STYLUS = 2;
     TOUCHSCREEN_FINGER = 3;
   }
-
   enum KeysHidden {
     KEYS_HIDDEN_UNSET = 0;
     KEYS_HIDDEN_KEYSEXPOSED = 1;
     KEYS_HIDDEN_KEYSHIDDEN = 2;
     KEYS_HIDDEN_KEYSSOFT = 3;
   }
-
   enum Keyboard {
     KEYBOARD_UNSET = 0;
     KEYBOARD_NOKEYS = 1;
     KEYBOARD_QWERTY = 2;
     KEYBOARD_TWELVEKEY = 3;
   }
-
   enum NavHidden {
     NAV_HIDDEN_UNSET = 0;
     NAV_HIDDEN_NAVEXPOSED = 1;
     NAV_HIDDEN_NAVHIDDEN = 2;
   }
-
   enum Navigation {
     NAVIGATION_UNSET = 0;
     NAVIGATION_NONAV = 1;
@@ -119,88 +102,69 @@ message Configuration {
     NAVIGATION_TRACKBALL = 3;
     NAVIGATION_WHEEL = 4;
   }
-
+  enum GrammaticalGender {
+    GRAM_GENDER_USET = 0;
+    GRAM_GENDER_NEUTER = 1;
+    GRAM_GENDER_FEMININE = 2;
+    GRAM_GENDER_MASCULINE = 3;
+  }
   //
   // Axis/dimensions that are understood by the runtime.
   //
-
   // Mobile country code.
   uint32 mcc = 1;
-
   // Mobile network code.
   uint32 mnc = 2;
-
   // BCP-47 locale tag.
   string locale = 3;
-
   // Left-to-right, right-to-left...
   LayoutDirection layout_direction = 4;
-
   // Screen width in pixels. Prefer screen_width_dp.
   uint32 screen_width = 5;
-
   // Screen height in pixels. Prefer screen_height_dp.
   uint32 screen_height = 6;
-
   // Screen width in density independent pixels (dp).
   uint32 screen_width_dp = 7;
-
   // Screen height in density independent pixels (dp).
   uint32 screen_height_dp = 8;
-
   // The smallest screen dimension, regardless of orientation, in dp.
   uint32 smallest_screen_width_dp = 9;
-
   // Whether the device screen is classified as small, normal, large, xlarge.
   ScreenLayoutSize screen_layout_size = 10;
-
   // Whether the device screen is long.
   ScreenLayoutLong screen_layout_long = 11;
-
   // Whether the screen is round (Android Wear).
   ScreenRound screen_round = 12;
-
   // Whether the screen supports wide color gamut.
   WideColorGamut wide_color_gamut = 13;
-
   // Whether the screen has high dynamic range.
   Hdr hdr = 14;
-
   // Which orientation the device is in (portrait, landscape).
   Orientation orientation = 15;
-
   // Which type of UI mode the device is in (television, car, etc.).
   UiModeType ui_mode_type = 16;
-
   // Whether the device is in night mode.
   UiModeNight ui_mode_night = 17;
-
   // The device's screen density in dots-per-inch (dpi).
   uint32 density = 18;
-
   // Whether a touchscreen exists, supports a stylus, or finger.
   Touchscreen touchscreen = 19;
-
   // Whether the keyboard hardware keys are currently hidden, exposed, or
   // if the keyboard is a software keyboard.
   KeysHidden keys_hidden = 20;
-
   // The type of keyboard present (none, QWERTY, 12-key).
   Keyboard keyboard = 21;
-
   // Whether the navigation is exposed or hidden.
   NavHidden nav_hidden = 22;
-
   // The type of navigation present on the device
   // (trackball, wheel, dpad, etc.).
   Navigation navigation = 23;
-
   // The minimum SDK version of the device.
   uint32 sdk_version = 24;
-
+  // Grammatical gender.
+  GrammaticalGender grammatical_gender = 26;
   //
   // Build-time only dimensions.
   //
-
   string product = 25;
 }