keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove Session public chat notice

Browse Source
pull/130/head
Niels Andriesse 5 years ago
parent 115ad5d852
commit 142867abf9
3 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File

4
Signal.xcodeproj/project.pbxproj
Unescape Escape View File

@ -589,7 +589,6 @@
B8544E3523D5201400299F14 /* UIView+Constraints.swift in Sources */ = {isa = PBXBuildFile; fileRef = B885D5F52334A32100EE0D8E /* UIView+Constraints.swift */; };
B86BD08423399ACF000F5AE3 /* Modal.swift in Sources */ = {isa = PBXBuildFile; fileRef = B86BD08323399ACF000F5AE3 /* Modal.swift */; };
B86BD08623399CEF000F5AE3 /* SeedModal.swift in Sources */ = {isa = PBXBuildFile; fileRef = B86BD08523399CEF000F5AE3 /* SeedModal.swift */; };
B8783E9C23EB8DDE00404FB8 /* GeneralUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8783E9B23EB8DDE00404FB8 /* GeneralUtilities.swift */; };
B8783E9E23EB948D00404FB8 /* UILabel+Interaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8783E9D23EB948D00404FB8 /* UILabel+Interaction.swift */; };
B885D5F4233491AB00EE0D8E /* DeviceLinkingModal.swift in Sources */ = {isa = PBXBuildFile; fileRef = B885D5F3233491AB00EE0D8E /* DeviceLinkingModal.swift */; };
B886B4A72398B23E00211ABE /* QRCodeVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B886B4A62398B23E00211ABE /* QRCodeVC.swift */; };
@ -1433,7 +1432,6 @@
B8544E3223D50E4900299F14 /* AppearanceUtilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppearanceUtilities.swift; sourceTree = "<group>"; };
B86BD08323399ACF000F5AE3 /* Modal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modal.swift; sourceTree = "<group>"; };
B86BD08523399CEF000F5AE3 /* SeedModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeedModal.swift; sourceTree = "<group>"; };
B8783E9B23EB8DDE00404FB8 /* GeneralUtilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralUtilities.swift; sourceTree = "<group>"; };
B8783E9D23EB948D00404FB8 /* UILabel+Interaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+Interaction.swift"; sourceTree = "<group>"; };
B885D5F3233491AB00EE0D8E /* DeviceLinkingModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceLinkingModal.swift; sourceTree = "<group>"; };
B885D5F52334A32100EE0D8E /* UIView+Constraints.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Constraints.swift"; sourceTree = "<group>"; };
@ -2807,7 +2805,6 @@
children = (
B8544E3223D50E4900299F14 /* AppearanceUtilities.swift */,
B8544E3023D16CA500299F14 /* DeviceUtilities.swift */,
B8783E9B23EB8DDE00404FB8 /* GeneralUtilities.swift */,
B847570223D5698100759540 /* LokiPushNotificationManager.swift */,
B84664F4235022F30083A1CD /* MentionUtilities.swift */,
B886B4A82398BA1500211ABE /* QRCode.swift */,
@ -3908,7 +3905,6 @@
3403B95D20EA9527001A1F44 /* OWSContactShareButtonsView.m in Sources */,
34B0796D1FCF46B100E248C2 /* MainAppContext.m in Sources */,
34E3EF101EFC2684007F6822 /* DebugUIPage.m in Sources */,
B8783E9C23EB8DDE00404FB8 /* GeneralUtilities.swift in Sources */,
B80C6B572384A56D00FDBC8B /* DeviceLinksVC.swift in Sources */,
34A8B3512190A40E00218A25 /* MediaAlbumCellView.swift in Sources */,
34D1F0AE1F867BFC0066283D /* OWSMessageCell.m in Sources */,

29
Signal/src/Loki/Utilities/GeneralUtilities.swift
Unescape Escape View File

@ -1,29 +0,0 @@
@objc(LKGeneralUtilities)
final class GeneralUtilities : NSObject {
private override init() { }
@objc static func getSessionPublicChatNotice() -> String {
return """
Welcome to the Session public chat! In order for this forum to be a fun environment, full of robust and constructive discussion and inclusive of everyone, please read and follow the rules below.
1. Please Keep Talk Relevant to Topic and Add Value to the Discussion.
(No Referral Links, Spamming, Off Topic Discussion)
2. You don't have to love everyone, but be civil.
(No Baiting, Excessively Partisan Arguments, Threats, and so on. Use common sense.)
3. Do not be a shill.
Comparison and criticism is reasonable, but blatant shilling of anything you work for, work on, or own is not.
4. Don't post explicit content - be it excessively offensive language, sexual, or violent. Any form of bigotry including racism, sexism, transphobia, homophobia, ableism, fatphobia, classism will NOT be tolerated.
If you break these rules, you’ll be warned by an admin. If your behaviour doesn’t improve, you will be removed from the public chat. Admins reserve the right to remove anyone violating these rules.
We want to keep this group a pleasant and supportive space for everyone.
If you experience any anti-social behaviour or have an issue with these rules, please contact an admin.
"""
}
}

8
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
Unescape Escape View File

@ -1440,14 +1440,6 @@ typedef enum : NSUInteger {
[self updateInputToolbarLayout];
[self ensureScrollDownButton];
NSUserDefaults *userDefaults = NSUserDefaults.standardUserDefaults;
if ([@"Session Public Chat" isEqual:self.thread.name] && ![userDefaults boolForKey:@"hasSeenSessionPublicChatNotice"]) {
UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"The Rules" message:[LKGeneralUtilities getSessionPublicChatNotice] preferredStyle:UIAlertControllerStyleAlert];
[alert addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:nil]];
[self presentViewController:alert animated:YES completion:nil];
[userDefaults setBool:YES forKey:@"hasSeenSessionPublicChatNotice"];
}
}
// `viewWillDisappear` is called whenever the view *starts* to disappear,

Write Preview
Loading…
Cancel
Save