From 4bd339d456e4909a77d2e8e7d6076557374e529c Mon Sep 17 00:00:00 2001
From: Davide De Rosa <keeshux@gmail.com>
Date: Tue, 23 Oct 2018 10:25:16 +0200
Subject: [PATCH] Remove "Report issue" from About

Will bind report to current profile.
---
 .../Scenes/Organizer/AboutViewController.swift   | 16 +---------------
 .../Scenes/ServiceViewController.swift           |  2 +-
 .../Resources/en.lproj/Localizable.strings       |  2 +-
 Passepartout/Sources/SwiftGen+Strings.swift      | 10 +++++-----
 4 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/Passepartout-iOS/Scenes/Organizer/AboutViewController.swift b/Passepartout-iOS/Scenes/Organizer/AboutViewController.swift
index e1eca10c..9d48e56a 100644
--- a/Passepartout-iOS/Scenes/Organizer/AboutViewController.swift
+++ b/Passepartout-iOS/Scenes/Organizer/AboutViewController.swift
@@ -39,7 +39,7 @@ class AboutViewController: UITableViewController, TableModelHost {
         model.setHeader(L10n.About.Sections.Feedback.header, for: .feedback)
         model.set([.version, .credits, .disclaimer, .website], in: .info)
         model.set([.sourcePassepartout, .sourceTunnelKit], in: .source)
-        model.set([.requestSupport, .reportIssue, .writeReview], in: .feedback)
+        model.set([.requestSupport, .writeReview], in: .feedback)
         return model
     }()
     
@@ -86,10 +86,6 @@ class AboutViewController: UITableViewController, TableModelHost {
         UIApplication.shared.open(AppConstants.URLs.subreddit, options: [:], completionHandler: nil)
     }
     
-    private func reportConnectivityIssue() {
-        IssueReporter.shared.present(in: self)
-    }
-    
     private func writeReview() {
         let url = AppConstants.URLs.review(withId: GroupConstants.App.appId)
         UIApplication.shared.open(url, options: [:], completionHandler: nil)
@@ -148,8 +144,6 @@ extension AboutViewController {
         
         case requestSupport
         
-        case reportIssue
-
         case writeReview
     }
 
@@ -207,11 +201,6 @@ extension AboutViewController {
             cell.leftText = L10n.About.Cells.RequestSupport.caption
             return cell
             
-        case .reportIssue:
-            let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
-            cell.leftText = L10n.About.Cells.ReportIssue.caption
-            return cell
-            
         case .writeReview:
             let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
             cell.leftText = L10n.About.Cells.WriteReview.caption
@@ -242,9 +231,6 @@ extension AboutViewController {
         case .requestSupport:
             postSupportRequest()
             
-        case .reportIssue:
-            reportConnectivityIssue()
-            
         case .writeReview:
             writeReview()
         }
diff --git a/Passepartout-iOS/Scenes/ServiceViewController.swift b/Passepartout-iOS/Scenes/ServiceViewController.swift
index 9ce44e9f..60a03668 100644
--- a/Passepartout-iOS/Scenes/ServiceViewController.swift
+++ b/Passepartout-iOS/Scenes/ServiceViewController.swift
@@ -664,7 +664,7 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog
             
         case .reportIssue:
             let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
-            cell.leftText = L10n.About.Cells.ReportIssue.caption
+            cell.leftText = L10n.Service.Cells.ReportIssue.caption
             return cell
         }
     }
diff --git a/Passepartout/Resources/en.lproj/Localizable.strings b/Passepartout/Resources/en.lproj/Localizable.strings
index f767c539..c85fc53d 100644
--- a/Passepartout/Resources/en.lproj/Localizable.strings
+++ b/Passepartout/Resources/en.lproj/Localizable.strings
@@ -97,6 +97,7 @@
 "service.cells.test_connectivity.caption" = "Test connectivity";
 "service.cells.data_count.caption" = "Exchanged bytes count";
 "service.cells.debug_log.caption" = "Debug log";
+"service.cells.report_issue.caption" = "Report connectivity issue";
 
 "service.alerts.credentials_needed.message" = "You need to enter account credentials first.";
 "service.alerts.reconnect_vpn.message" = "Do you want to reconnect to the VPN?";
@@ -182,7 +183,6 @@
 "about.sections.feedback.header" = "Feedback";
 "about.cells.version.caption" = "Version";
 "about.cells.request_support.caption" = "Request support";
-"about.cells.report_issue.caption" = "Report connectivity issue";
 "about.cells.write_review.caption" = "Write a review";
 "about.cells.website.caption" = "Visit website";
 
diff --git a/Passepartout/Sources/SwiftGen+Strings.swift b/Passepartout/Sources/SwiftGen+Strings.swift
index ef525539..7807eb4c 100644
--- a/Passepartout/Sources/SwiftGen+Strings.swift
+++ b/Passepartout/Sources/SwiftGen+Strings.swift
@@ -14,11 +14,6 @@ internal enum L10n {
 
     internal enum Cells {
 
-      internal enum ReportIssue {
-        /// Report connectivity issue
-        internal static let caption = L10n.tr("Localizable", "about.cells.report_issue.caption")
-      }
-
       internal enum RequestSupport {
         /// Request support
         internal static let caption = L10n.tr("Localizable", "about.cells.request_support.caption")
@@ -562,6 +557,11 @@ internal enum L10n {
         internal static let caption = L10n.tr("Localizable", "service.cells.reconnect.caption")
       }
 
+      internal enum ReportIssue {
+        /// Report connectivity issue
+        internal static let caption = L10n.tr("Localizable", "service.cells.report_issue.caption")
+      }
+
       internal enum TestConnectivity {
         /// Test connectivity
         internal static let caption = L10n.tr("Localizable", "service.cells.test_connectivity.caption")