🐛 Add http request support configuration in android

⬆️ Upgrade flutter sdk constraints. 🐛 removed hash work detection from link preview regex. ⬆️ upgrade list literals to support listerals
TheAlphamerc · Apr 3, 2021 · 5dc2e22 · 5dc2e22
1 parent 3cb7a5e
commit 5dc2e22
Show file tree

Hide file tree

Showing 13 changed files with 77 additions and 50 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -10,7 +10,9 @@
      <application
         android:name="io.flutter.app.FlutterApplication"
         android:label="Fwitter"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:usesCleartextTraffic="true"
+        >
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
@@ -35,6 +37,8 @@
               android:name="io.flutter.embedding.android.SplashScreenDrawable"
               android:resource="@drawable/launch_background"
               />
+            <meta-data android:name="io.flutter.network-policy"
+              android:resource="@xml/network_security_config"/>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>

diff --git a/android/app/src/main/res/xml/network_security_config.xml b/android/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>
diff --git a/lib/helper/utility.dart b/lib/helper/utility.dart
@@ -165,7 +165,7 @@ class Utility {
     RegExp reg = RegExp(
         r"([#])\w+|(https?|ftp|file|#)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]*");
     Iterable<Match> _matches = reg.allMatches(text);
-    List<String> resultMatches = List<String>();
+    List<String> resultMatches = <String>[];
     for (Match match in _matches) {
       if (match.group(0).isNotEmpty) {
         var tag = match.group(0);

diff --git a/lib/model/feedModel.dart b/lib/model/feedModel.dart
@@ -65,13 +65,13 @@ class FeedModel {
     parentkey = map['parentkey'];
     childRetwetkey = map['childRetwetkey'];
     if (map['tags'] != null) {
-      tags = List<String>();
+      tags = <String>[];
       map['tags'].forEach((value) {
         tags.add(value);
       });
     }
     if (map["likeList"] != null) {
-      likeList = List<String>();
+      likeList = <String>[];
 
       final list = map['likeList'];
 
@@ -101,7 +101,7 @@ class FeedModel {
     }
     if (map['replyTweetKeyList'] != null) {
       map['replyTweetKeyList'].forEach((value) {
-        replyTweetKeyList = List<String>();
+        replyTweetKeyList = <String>[];
         map['replyTweetKeyList'].forEach((value) {
           replyTweetKeyList.add(value);
         });

diff --git a/lib/state/chats/chatState.dart b/lib/state/chats/chatState.dart
@@ -102,7 +102,7 @@ class ChatState extends AppState {
           .child(userId)
           .once()
           .then((DataSnapshot snapshot) {
-        _chatUserList = List<ChatMessage>();
+        _chatUserList = <ChatMessage>[];
         if (snapshot.value != null) {
           var map = snapshot.value;
           if (map != null) {
@@ -144,7 +144,7 @@ class ChatState extends AppState {
           .child(_channelName)
           .once()
           .then((DataSnapshot snapshot) {
-        _messageList = List<ChatMessage>();
+        _messageList = <ChatMessage>[];
         if (snapshot.value != null) {
           var map = snapshot.value;
           if (map != null) {
@@ -205,7 +205,7 @@ class ChatState extends AppState {
   /// Method will trigger every time when you send/recieve  from/to someone messgae.
   void _onMessageAdded(Event event) {
     if (_messageList == null) {
-      _messageList = List<ChatMessage>();
+      _messageList = <ChatMessage>[];
     }
     if (event.snapshot.value != null) {
       var map = event.snapshot.value;
@@ -226,7 +226,7 @@ class ChatState extends AppState {
 
   void _onMessageChanged(Event event) {
     if (_messageList == null) {
-      _messageList = List<ChatMessage>();
+      _messageList = <ChatMessage>[];
     }
     if (event.snapshot.value != null) {
       var map = event.snapshot.value;
@@ -247,7 +247,7 @@ class ChatState extends AppState {
 
   void _onChatUserAdded(Event event) {
     if (_chatUserList == null) {
-      _chatUserList = List<ChatMessage>();
+      _chatUserList = <ChatMessage>[];
     }
     if (event.snapshot.value != null) {
       var map = event.snapshot.value;

diff --git a/lib/state/feedState.dart b/lib/state/feedState.dart
@@ -141,7 +141,7 @@ class FeedState extends AppState {
       _feedlist = null;
       notifyListeners();
       kDatabase.child('tweet').once().then((DataSnapshot snapshot) {
-        _feedlist = List<FeedModel>();
+        _feedlist = <FeedModel>[];
         if (snapshot.value != null) {
           var map = snapshot.value;
           if (map != null) {
@@ -201,7 +201,7 @@ class FeedState extends AppState {
 
       if (_tweetDetail != null) {
         // Fetch comment tweets
-        _commentlist = List<FeedModel>();
+        _commentlist = <FeedModel>[];
         // Check if parent tweet has reply tweets or not
         if (_tweetDetail.replyTweetKeyList != null &&
             _tweetDetail.replyTweetKeyList.length > 0) {
@@ -489,7 +489,7 @@ class FeedState extends AppState {
     _onCommentAdded(tweet);
     tweet.key = event.snapshot.key;
     if (_feedlist == null) {
-      _feedlist = List<FeedModel>();
+      _feedlist = <FeedModel>[];
     }
     if ((_feedlist.length == 0 || _feedlist.any((x) => x.key != tweet.key)) &&
         tweet.isValidTweet) {

diff --git a/lib/state/notificationState.dart b/lib/state/notificationState.dart
@@ -127,7 +127,7 @@ class NotificationState extends AppState {
       var model = NotificationModel.fromJson(event.snapshot.key,
           event.snapshot.value["updatedAt"], event.snapshot.value["type"]);
       if (_notificationList == null) {
-        _notificationList = List<NotificationModel>();
+        _notificationList = <NotificationModel>[];
       }
       _notificationList.add(model);
       // added notification to list

diff --git a/lib/state/searchState.dart b/lib/state/searchState.dart
@@ -24,8 +24,8 @@ class SearchState extends AppState {
       isBusy = true;
       kDatabase.child('profile').once().then(
         (DataSnapshot snapshot) {
-          _userlist = List<UserModel>();
-          _userFilterlist = List<UserModel>();
+          _userlist = <UserModel>[];
+          _userFilterlist = <UserModel>[];
           if (snapshot.value != null) {
             var map = snapshot.value;
             if (map != null) {

diff --git a/lib/widgets/url_text/customUrlText.dart b/lib/widgets/url_text/customUrlText.dart
@@ -12,11 +12,11 @@ class UrlText extends StatelessWidget {
   UrlText({this.text, this.style, this.urlStyle, this.onHashTagPressed});
 
   List<InlineSpan> getTextSpans() {
-    List<InlineSpan> widgets = List<InlineSpan>();
+    List<InlineSpan> widgets = <InlineSpan>[];
     RegExp reg = RegExp(
         r"([#])\w+| [@]\w+|(https?|ftp|file|#)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]*");
     Iterable<Match> _matches = reg.allMatches(text);
-    List<_ResultMatch> resultMatches = List<_ResultMatch>();
+    List<_ResultMatch> resultMatches = <_ResultMatch>[];
     int start = 0;
     for (Match match in _matches) {
       if (match.group(0).isNotEmpty) {
@@ -59,6 +59,7 @@ class UrlText extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         RichText(
           text: TextSpan(children: getTextSpans()),

diff --git a/lib/widgets/url_text/custom_link_media_info.dart b/lib/widgets/url_text/custom_link_media_info.dart
@@ -20,7 +20,7 @@ class CustomLinkMediaInfo extends StatelessWidget {
       return null;
     }
     RegExp reg = RegExp(
-        r"([#])\w+| [@]\w+|(https?|ftp|file|#)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]*");
+        r"(https?|http)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]*");
     Iterable<Match> _matches = reg.allMatches(text);
     if (_matches.isNotEmpty) {
       return _matches.first.group(0);
@@ -125,7 +125,13 @@ class CustomLinkMediaInfo extends StatelessWidget {
                           ),
                         ),
                       ),
-                    Padding(
+                    Container(
+                      decoration: BoxDecoration(
+                        borderRadius: BorderRadius.circular(10),
+                        color: model.thumbnailUrl != null
+                            ? Theme.of(context).colorScheme.onPrimary
+                            : const Color(0xFFF0F1F2),
+                      ),
                       padding:
                           EdgeInsets.only(bottom: 5, left: 8, right: 8, top: 4),
                       child: Column(

diff --git a/lib/widgets/url_text/link_preview.dart b/lib/widgets/url_text/link_preview.dart
@@ -17,7 +17,7 @@ class LinkPreview extends StatelessWidget {
       return null;
     }
     RegExp reg = RegExp(
-        r"([#])\w+| [@]\w+|(https?|ftp|file|#)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]*");
+        r"(https?|http)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]*");
     Iterable<Match> _matches = reg.allMatches(text);
     if (_matches.isNotEmpty) {
       return _matches.first.group(0);
@@ -62,7 +62,7 @@ class LinkPreview extends StatelessWidget {
               borderRadius: BorderRadius.circular(10),
               border: Border.all(color: AppColor.extraLightGrey),
               color: webInfo.image != null
-                  ? Colors.transparent
+                  ? Theme.of(context).colorScheme.onPrimary
                   : const Color(0xFFF0F1F2),
             ),
             child: Column(