Merge pull request #98 from dart-lang/fix_npe

fix an npe in the getPlatformLocale method
dart-archive · Feb 14, 2017 · e956053 · e956053
2 parents 5b4c28a + f2f401e
commit e956053
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .packages
+.idea/
 .pub/
 build/
 pubspec.lock
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/usage.iml b/.idea/usage.iml
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 3.0.0+1
+- fixed an NPE in the `usage_io` `getPlatformLocale()` method
+
 ## 3.0.0
 - removed the use of configurable imports
 - removed the Flutter specific entry-point; Flutter apps can now use the

diff --git a/lib/src/usage_impl_io.dart b/lib/src/usage_impl_io.dart
@@ -142,7 +142,7 @@ String getPlatformLocale() {
   if (locale != null) {
     // Convert `en_US.UTF-8` to `en_US`.
     int index = locale.indexOf('.');
-    if (index != null) locale = locale.substring(0, index);
+    if (index != -1) locale = locale.substring(0, index);
 
     // Convert `en_US` to `en-us`.
     locale = locale.replaceAll('_', '-').toLowerCase();

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@
 # BSD-style license that can be found in the LICENSE file.
 
 name: usage
-version: 3.0.0
+version: 3.0.0+1
 description: A Google Analytics wrapper for both command-line, web, and Flutter apps.
 homepage: https://github.com/dart-lang/usage
 author: Dart Team <misc@dartlang.org>