Enable E2E enc by default, opt-out via -M

Author: tgalal

yowsup-cli

@@ -205,8 +205,7 @@ class DemosArgParser(YowArgParser):
         credentialsOpts.add_argument("-c", "--config", action="store",
                                      help = "Path to config file containing authentication info. For more info about config format use --help-config")
 
-        configGroup.add_argument("-m", "--moxie", action="store_true", help="Enable experimental support for the"
-                                                                            " new WhatsApp encryption")
+        configGroup.add_argument("-M", "--unmoxie", action="store_true", help="Disable E2E Encryption")
 
         cmdopts = self.add_argument_group("Command line interface demo")
         cmdopts.add_argument('-y', '--yowsup', action = "store_true", help = "Start the Yowsup command line client")
@@ -224,9 +223,6 @@ class DemosArgParser(YowArgParser):
     def process(self):
         super(DemosArgParser, self).process()
 
-        if self.args["moxie"]:
-            logger.warning("--moxie/-m is deprecated and will be removed soon as e2e encryption is now almost mandatory.")
-
         if self.args["yowsup"]:
             self.startCmdline()
         elif self.args["echo"]:
@@ -255,7 +251,7 @@ class DemosArgParser(YowArgParser):
         if not credentials:
             print("Error: You must specify a configuration method")
             sys.exit(1)
-        stack = cli.YowsupCliStack(credentials, self.args["moxie"])
+        stack = cli.YowsupCliStack(credentials, not self.args["unmoxie"])
         stack.start()
 
     def startEcho(self):
@@ -265,7 +261,7 @@ class DemosArgParser(YowArgParser):
             print("Error: You must specify a configuration method")
             sys.exit(1)
         try:
-            stack = echoclient.YowsupEchoStack(credentials, self.args["moxie"])
+            stack = echoclient.YowsupEchoStack(credentials, not self.args["unmoxie"])
             stack.start()
         except KeyboardInterrupt:
             print("\nYowsdown")
@@ -280,7 +276,7 @@ class DemosArgParser(YowArgParser):
 
         try:
             stack = sendclient.YowsupSendStack(credentials, [([self.args["send"][0], self.args["send"][1]])],
-                                               self.args["moxie"])
+                                               not self.args["unmoxie"])
             stack.start()
         except KeyboardInterrupt:
             print("\nYowsdown")
@@ -293,7 +289,7 @@ class DemosArgParser(YowArgParser):
             print("Error: You must specify a configuration method")
             sys.exit(1)
         try:
-            stack = contacts.YowsupSyncStack(credentials,self.args["sync"].split(','),self.args["moxie"])
+            stack = contacts.YowsupSyncStack(credentials,self.args["sync"].split(','), not self.args["unmoxie"])
             stack.start()
         except KeyboardInterrupt:
             print("\nYowsdown")
@@ -326,4 +322,3 @@ if __name__ == "__main__":
         parser = modeDict[mode]()
         if not parser.process():
             parser.print_help()
-