Revert "Add branding flag for default group to plaintext or "best""

This reverts commit fd52a70.

ChatSecure/Classes/Model/Yap Storage/OTRXMPPRoom.swift

@@ -8,7 +8,6 @@
 
 import UIKit
 import YapDatabase.YapDatabaseRelationship
-import OTRAssets
 
 @objc public enum RoomSecurity: Int {
     /// will choose omemo if _any_ occupants have available keys
@@ -35,7 +34,7 @@ import OTRAssets
     /// JID of the room itself
     @objc private var jid:String?
 
-    @objc open var preferredSecurity: RoomSecurity = OTRBranding.defaultGroupPlaintext ? .plaintext : .best
+    @objc open var preferredSecurity: RoomSecurity = .best
 
     /// XMPPJID of the room itself
     @objc public var roomJID: XMPPJID? {

OTRAssets/OTRBranding.h

@@ -98,8 +98,5 @@ FOUNDATION_EXPORT NSString *const kOTRSettingKeyLanguage;
 /** If enabled, will allow OMEMO functionality within the app. Defaults to YES if setting key is not present. */
 @property (class, readonly) BOOL allowOMEMO;
 
-/** If enabled, will enter groups in plaintext mode. Defaults to NO if setting key is not present, which will result in setting transport security to "best". */
-@property (class, readonly) BOOL defaultGroupPlaintext;
-
 @end
 NS_ASSUME_NONNULL_END

OTRAssets/OTRBranding.m

@@ -168,16 +168,6 @@ + (BOOL) allowOMEMO {
     }
 }
 
-+ (BOOL) defaultGroupPlaintext {
-    NSNumber *result = [[self defaultPlist] objectForKey:@"DefaultGroupPlaintext"];
-    if (!result) {
-        return NO;
-    } else {
-        return result.boolValue;
-    }
-}
-
-
 /** Returns true if we're running the official ChatSecure */
 + (BOOL) matchesUpstream {
     return [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.chrisballinger.ChatSecure"];

OTRResources/Branding.plist

@@ -48,7 +48,5 @@
 	<false/>
 	<key>AllowOMEMO</key>
 	<true/>
-	<key>DefaultGroupPlaintext</key>
-	<false/>
 </dict>
 </plist>