From 3697aad54b37b5e70aabe002963f3a92942ecc38 Mon Sep 17 00:00:00 2001
From: erinn <erinn@openprivacy.ca>
Date: Thu, 24 Jun 2021 22:30:46 -0700
Subject: [PATCH] logging prune

---
 lib/config.dart              |  6 ++++++
 lib/cwtch/cwtchNotifier.dart | 23 ++++++++++++-----------
 lib/model.dart               |  1 -
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/lib/config.dart b/lib/config.dart
index 7d0c4b8d..ea9faaef 100644
--- a/lib/config.dart
+++ b/lib/config.dart
@@ -3,4 +3,10 @@ const dev_version = "development";
 class EnvironmentConfig {
   static const BUILD_VER = String.fromEnvironment('BUILD_VER', defaultValue: dev_version);
   static const BUILD_DATE = String.fromEnvironment('BUILD_DATE', defaultValue: "now");
+
+  static void debugLog(String log) {
+    if (EnvironmentConfig.BUILD_VER == dev_version) {
+      print(log);
+    }
+  }
 }
diff --git a/lib/cwtch/cwtchNotifier.dart b/lib/cwtch/cwtchNotifier.dart
index 34b5589a..a6e15b91 100644
--- a/lib/cwtch/cwtchNotifier.dart
+++ b/lib/cwtch/cwtchNotifier.dart
@@ -5,6 +5,7 @@ import 'package:provider/provider.dart';
 
 import 'package:cwtch/torstatus.dart';
 
+import '../config.dart';
 import '../errorHandler.dart';
 import '../model.dart';
 import '../settings.dart';
@@ -150,7 +151,7 @@ class CwtchNotifier {
         profileCN.getProfile(data["Identity"])?.contactList.getContact(contactHandle)!.totalMessages = int.parse(data["Data"]);
         break;
       case "IndexedFailure":
-        print("IndexedFailure");
+        EnvironmentConfig.debugLog("IndexedFailure");
         var idx = data["Index"];
         var key = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"])!.getMessageKey(idx);
         try {
@@ -162,7 +163,7 @@ class CwtchNotifier {
         break;
       case "SendMessageToGroupError":
         // from me (already displayed - do not update counter)
-        print("SendMessageToGroupError");
+        EnvironmentConfig.debugLog("SendMessageToGroupError");
         var idx = data["Signature"];
         var key = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"])!.getMessageKey(idx);
         if (key == null) break;
@@ -175,7 +176,7 @@ class CwtchNotifier {
         }
         break;
       case "AppError":
-        print("New App Error: $data");
+        EnvironmentConfig.debugLog("New App Error: $data");
         // special case for delete error (todo: standardize cwtch errors)
         if (data["Error"] == "Password did not match") {
           error.handleUpdate("deleteprofile.error");
@@ -190,7 +191,7 @@ class CwtchNotifier {
         if (data["Key"] == "public.name") {
           profileCN.getProfile(data["ProfileOnion"])?.nickname = data["Data"];
         } else {
-          print("unhandled set attribute event: ${data['Key']}");
+          EnvironmentConfig.debugLog("unhandled set attribute event: ${data['Key']}");
         }
         break;
       case "NetworkError":
@@ -198,18 +199,18 @@ class CwtchNotifier {
         profileCN.getProfile(data["ProfileOnion"])?.isOnline = isOnline;
         break;
       case "ACNStatus":
-        print("acn status: $data");
+        EnvironmentConfig.debugLog("acn status: $data");
         torStatus.handleUpdate(int.parse(data["Progress"]), data["Status"]);
         break;
       case "ACNVersion":
-        print("acn version: $data");
+        EnvironmentConfig.debugLog("acn version: $data");
         torStatus.updateVersion(data["Data"]);
         break;
       case "UpdateServerInfo":
         profileCN.getProfile(data["ProfileOnion"])?.replaceServers(data["ServerList"]);
         break;
       case "NewGroup":
-        print("new group");
+        EnvironmentConfig.debugLog("new group");
         String invite = data["GroupInvite"].toString();
         if (invite.startsWith("torv3")) {
           String inviteJson = new String.fromCharCodes(base64Decode(invite.substring(5)));
@@ -236,7 +237,7 @@ class CwtchNotifier {
         }
         break;
       case "AcceptGroupInvite":
-        print("accept group invite");
+        EnvironmentConfig.debugLog("accept group invite");
 
         profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"])!.isInvitation = false;
         profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(data["GroupID"], DateTime.now());
@@ -257,7 +258,7 @@ class CwtchNotifier {
             profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"])!.nickname = data["Data"];
           }
         } else {
-          print("unhandled set group attribute event: ${data['Key']}");
+          EnvironmentConfig.debugLog("unhandled set group attribute event: ${data['Key']}");
         }
         break;
       case "NewRetValMessageFromPeer":
@@ -267,11 +268,11 @@ class CwtchNotifier {
             profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"])!.nickname = data["Data"];
           }
         } else {
-          print("unhandled peer attribute event: ${data['Path']}");
+          EnvironmentConfig.debugLog("unhandled peer attribute event: ${data['Path']}");
         }
         break;
       default:
-        print("unhandled event: $type");
+        EnvironmentConfig.debugLog("unhandled event: $type");
     }
   }
 }
diff --git a/lib/model.dart b/lib/model.dart
index df44a3ba..32dbb485 100644
--- a/lib/model.dart
+++ b/lib/model.dart
@@ -227,7 +227,6 @@ class ProfileInfoState extends ChangeNotifier {
   // Parse out the server list json into our server info state struct...
   void replaceServers(String serversJson) {
     if (serversJson != "" && serversJson != "null") {
-      print("got serversJson");
       List<dynamic> servers = jsonDecode(serversJson);
       this._servers.replace(servers.map((server) {
         // TODO Keys...