Merge pull request #59 from shounakmulay/feature/null-safety

Feature/null safety - Enable null safety

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.0
+* Feature equivalent of v0.0.9
+* Enabled null-safety
+
 ## 0.0.9
 * Fix sendSms Future never completes.
 

lib/constants.dart

@@ -171,10 +171,10 @@ enum SmsStatus { STATUS_COMPLETE, STATUS_FAILED, STATUS_NONE, STATUS_PENDING }
 enum DataState { DISCONNECTED, CONNECTING, CONNECTED, SUSPENDED, UNKNOWN }
 
 /// Represents state of cellular calls.
-enum CallState { IDLE, RINGING, OFFHOOK }
+enum CallState { IDLE, RINGING, OFFHOOK, UNKNOWN }
 
 /// Represents state of cellular network data activity.
-enum DataActivity { NONE, IN, OUT, INOUT, DORMANT }
+enum DataActivity { NONE, IN, OUT, INOUT, DORMANT, UNKNOWN }
 
 /// Represents types of networks for a device.
 enum NetworkType {
@@ -202,7 +202,7 @@ enum NetworkType {
 }
 
 /// Represents types of cellular technology supported by a device.
-enum PhoneType { NONE, GSM, CDMA, SIP }
+enum PhoneType { NONE, GSM, CDMA, SIP, UNKNOWN }
 
 /// Represents state of SIM.
 enum SimState {
@@ -221,7 +221,7 @@ enum SimState {
 }
 
 /// Represents state of cellular service.
-enum ServiceState { IN_SERVICE, OUT_OF_SERVICE, EMERGENCY_ONLY, POWER_OFF }
+enum ServiceState { IN_SERVICE, OUT_OF_SERVICE, EMERGENCY_ONLY, POWER_OFF, UNKNOWN }
 
 /// Represents the quality of cellular signal.
 enum SignalStrength { NONE_OR_UNKNOWN, POOR, MODERATE, GOOD, GREAT }
@@ -234,11 +234,9 @@ extension Value on Sort {
     switch (this) {
       case Sort.ASC:
         return "ASC";
-        break;
       case Sort.DESC:
       default:
         return "DESC";
-        break;
     }
   }
 }

lib/filter.dart

@@ -90,8 +90,8 @@ class ConversationFilter
 
 abstract class FilterStatement<T extends Filter, K> {
   String _column;
-  String _previousFilter;
-  List<String> _previousFilterArgs;
+  String _previousFilter = "";
+  List<String> _previousFilterArgs = [];
 
   FilterStatement._(this._column);
 
@@ -167,12 +167,8 @@ class SmsFilterStatement
 
   @override
   SmsFilter _createFilter(String value, String operator) {
-    if (_previousFilter != null) {
-      return SmsFilter._("$_previousFilter $_column $operator ?",
-          _previousFilterArgs..add(value));
-    } else {
-      return SmsFilter._("$_column $operator ?", [value]);
-    }
+    return SmsFilter._("$_previousFilter $_column $operator ?",
+        _previousFilterArgs..add(value));
   }
 }
 
@@ -186,12 +182,8 @@ class ConversationFilterStatement
 
   @override
   ConversationFilter _createFilter(String value, String operator) {
-    if (_previousFilter != null) {
-      return ConversationFilter._("$_previousFilter $_column $operator ?",
-          _previousFilterArgs..add(value));
-    } else {
-      return ConversationFilter._("$_column $operator ?", [value]);
-    }
+    return ConversationFilter._("$_previousFilter $_column $operator ?",
+        _previousFilterArgs..add(value));
   }
 }
 
@@ -200,10 +192,8 @@ class OrderBy {
   Sort _sort = Sort.DESC;
 
   /// Orders the query results by the provided column and [sort] value.
-  OrderBy(this._column, {Sort sort}) {
-    if (sort != null) {
-      _sort = sort;
-    }
+  OrderBy(this._column, {Sort sort = Sort.DESC}) {
+    _sort = sort;
   }
 
   String get _value => "${_column._name} ${_sort.value}";