Skip to content

Commit ec5b007

Browse files
author
Thomas Taschauer
committed
Merge branch 'development' of github.com:TomTasche/OpenDocument.ios into feature/lite-version
2 parents 8090e90 + ef93111 commit ec5b007

428 files changed

Lines changed: 208 additions & 62573 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ playground.xcworkspace
4646
# you should judge for yourself, the pros and cons are mentioned at:
4747
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
4848
#
49-
# Pods/
49+
Pods/
5050

5151
# Carthage
5252
#

‎OpenDocument.core‎

‎OpenDocumentReader.xcodeproj/project.pbxproj‎

Lines changed: 92 additions & 61 deletions
Large diffs are not rendered by default.

‎OpenDocumentReader/AppDelegate.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,22 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
4646

4747
func application(_ app: UIApplication, open inputURL: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
4848
guard let documentBrowserViewController = window?.rootViewController as? DocumentBrowserViewController else {
49-
Crashlytics.sharedInstance().throwException()
49+
fatalError("documentBrowserViewController is null")
5050

5151
return false
5252
}
5353

5454
documentBrowserViewController.revealDocument(at: inputURL, importIfNeeded: true) { (revealedDocumentURL, error) in
5555

5656
guard error == nil else {
57-
Crashlytics.sharedInstance().recordError(error!)
58-
Crashlytics.sharedInstance().throwException()
57+
Crashlytics.crashlytics().record(error: error!)
58+
fatalError("error is not null")
5959

6060
return
6161
}
6262

6363
guard let url = revealedDocumentURL else {
64-
Crashlytics.sharedInstance().throwException()
64+
fatalError("revealedDocumentURL is null")
6565

6666
return
6767
}

‎OpenDocumentReader/CoreWrapper.mm‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,17 @@ - (bool)backTranslate:(NSString *)diff into:(NSString *)outputPath {
8383
try {
8484
_errorCode = 0;
8585

86-
bool translated = translator.backTranslate([diff cStringUsingEncoding:NSUTF8StringEncoding], [outputPath cStringUsingEncoding:NSUTF8StringEncoding]);
87-
if (!translated) {
86+
bool success = translator.edit([diff cStringUsingEncoding:NSUTF8StringEncoding]);
87+
if (!success) {
8888
_errorCode = @(-4);
8989
return false;
9090
}
91+
92+
success = translator.save([outputPath cStringUsingEncoding:NSUTF8StringEncoding]);
93+
if (!success) {
94+
_errorCode = @(-5);
95+
return false;
96+
}
9197
} catch (...) {
9298
_errorCode = @(-3);
9399
return false;

‎OpenDocumentReader/Document.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ class Document: UIDocument {
124124

125125
webview?.evaluateJavaScript("generateDiff()", completionHandler: { (value: Any!, error: Error!) -> Void in
126126
if error != nil {
127-
Crashlytics.sharedInstance().recordError(error)
128-
Crashlytics.sharedInstance().throwException()
127+
Crashlytics.crashlytics().record(error: error)
128+
fatalError("generateDiff failed")
129129

130130
return
131131
}

‎OpenDocumentReader/DocumentBrowserViewController.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class DocumentBrowserViewController: UIDocumentBrowserViewController, UIDocument
6363
func documentBrowser(_ controller: UIDocumentBrowserViewController,
6464
didPickDocumentURLs documentURLs: [URL]) {
6565
guard let url = documentURLs.first else {
66-
Crashlytics.sharedInstance().throwException()
66+
fatalError("documentURL is null")
6767

6868
return
6969
}
@@ -103,7 +103,7 @@ class DocumentBrowserViewController: UIDocumentBrowserViewController, UIDocument
103103
transitionController.loadingProgress = nil
104104

105105
guard success else {
106-
Crashlytics.sharedInstance().throwException()
106+
fatalError("opening document failed")
107107

108108
return
109109
}

‎OpenDocumentReader/DocumentViewController.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class DocumentViewController: UIViewController, DocumentDelegate {
135135

136136
@IBAction func returnToDocuments(_ sender: Any) {
137137
guard let doc = document else {
138-
Crashlytics.sharedInstance().throwException()
138+
fatalError("document is null")
139139

140140
return
141141
}
@@ -165,7 +165,7 @@ class DocumentViewController: UIViewController, DocumentDelegate {
165165

166166
func closeCurrentDocument() {
167167
guard let doc = document else {
168-
Crashlytics.sharedInstance().throwException()
168+
fatalError("document is null")
169169

170170
return
171171
}
@@ -212,7 +212,7 @@ class DocumentViewController: UIViewController, DocumentDelegate {
212212
Analytics.logEvent("menu_edit_discard", parameters: nil)
213213

214214
guard let doc = document else {
215-
Crashlytics.sharedInstance().throwException()
215+
fatalError("document is null")
216216

217217
return
218218
}
@@ -224,7 +224,7 @@ class DocumentViewController: UIViewController, DocumentDelegate {
224224
Analytics.logEvent("menu_edit_save", parameters: nil)
225225

226226
guard let doc = document else {
227-
Crashlytics.sharedInstance().throwException()
227+
fatalError("document is null")
228228

229229
return
230230
}

‎Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ target 'OpenDocumentReader' do
77
pod 'ScrollableSegmentedControl'
88
pod 'Firebase/Core'
99
pod 'Firebase/Storage'
10-
pod 'Fabric'
11-
pod 'Crashlytics'
1210
pod 'Google-Mobile-Ads-SDK'
11+
pod 'Firebase/Crashlytics'
12+
pod 'Firebase/Analytics'
1313
end

‎Podfile.lock‎

Lines changed: 92 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,114 @@
11
PODS:
2-
- Crashlytics (3.14.0):
3-
- Fabric (~> 1.10.2)
4-
- Fabric (1.10.2)
5-
- Firebase/Core (6.9.0):
2+
- Firebase/Analytics (6.22.0):
3+
- Firebase/Core
4+
- Firebase/Core (6.22.0):
65
- Firebase/CoreOnly
7-
- FirebaseAnalytics (= 6.1.2)
8-
- Firebase/CoreOnly (6.9.0):
9-
- FirebaseCore (= 6.3.0)
10-
- Firebase/Storage (6.9.0):
6+
- FirebaseAnalytics (= 6.4.1)
7+
- Firebase/CoreOnly (6.22.0):
8+
- FirebaseCore (= 6.6.6)
9+
- Firebase/Crashlytics (6.22.0):
1110
- Firebase/CoreOnly
12-
- FirebaseStorage (~> 3.4.1)
13-
- FirebaseAnalytics (6.1.2):
14-
- FirebaseCore (~> 6.3)
15-
- FirebaseInstanceID (~> 4.2)
16-
- GoogleAppMeasurement (= 6.1.2)
11+
- FirebaseCrashlytics (~> 4.0.0-beta.7)
12+
- Firebase/Storage (6.22.0):
13+
- Firebase/CoreOnly
14+
- FirebaseStorage (~> 3.6.0)
15+
- FirebaseAnalytics (6.4.1):
16+
- FirebaseCore (~> 6.6)
17+
- FirebaseInstallations (~> 1.1)
18+
- GoogleAppMeasurement (= 6.4.1)
1719
- GoogleUtilities/AppDelegateSwizzler (~> 6.0)
1820
- GoogleUtilities/MethodSwizzler (~> 6.0)
1921
- GoogleUtilities/Network (~> 6.0)
2022
- "GoogleUtilities/NSData+zlib (~> 6.0)"
21-
- nanopb (~> 0.3)
22-
- FirebaseAuthInterop (1.0.0)
23-
- FirebaseCore (6.3.0):
24-
- FirebaseCoreDiagnostics (~> 1.0)
25-
- FirebaseCoreDiagnosticsInterop (~> 1.0)
26-
- GoogleUtilities/Environment (~> 6.2)
27-
- GoogleUtilities/Logger (~> 6.2)
28-
- FirebaseCoreDiagnostics (1.1.0):
29-
- FirebaseCoreDiagnosticsInterop (~> 1.0)
30-
- GoogleDataTransportCCTSupport (~> 1.0)
31-
- GoogleUtilities/Environment (~> 6.2)
32-
- GoogleUtilities/Logger (~> 6.2)
33-
- FirebaseCoreDiagnosticsInterop (1.0.0)
34-
- FirebaseInstanceID (4.2.5):
35-
- FirebaseCore (~> 6.0)
36-
- GoogleUtilities/Environment (~> 6.0)
37-
- GoogleUtilities/UserDefaults (~> 6.0)
38-
- FirebaseStorage (3.4.1):
39-
- FirebaseAuthInterop (~> 1.0)
40-
- FirebaseCore (~> 6.0)
23+
- nanopb (= 0.3.9011)
24+
- FirebaseAnalyticsInterop (1.5.0)
25+
- FirebaseAuthInterop (1.1.0)
26+
- FirebaseCore (6.6.6):
27+
- FirebaseCoreDiagnostics (~> 1.2)
28+
- FirebaseCoreDiagnosticsInterop (~> 1.2)
29+
- GoogleUtilities/Environment (~> 6.5)
30+
- GoogleUtilities/Logger (~> 6.5)
31+
- FirebaseCoreDiagnostics (1.2.3):
32+
- FirebaseCoreDiagnosticsInterop (~> 1.2)
33+
- GoogleDataTransportCCTSupport (~> 2.0)
34+
- GoogleUtilities/Environment (~> 6.5)
35+
- GoogleUtilities/Logger (~> 6.5)
36+
- nanopb (~> 0.3.901)
37+
- FirebaseCoreDiagnosticsInterop (1.2.0)
38+
- FirebaseCrashlytics (4.0.0-beta.7):
39+
- FirebaseAnalyticsInterop (~> 1.2)
40+
- FirebaseCore (~> 6.6)
41+
- FirebaseInstallations (~> 1.1)
42+
- GoogleDataTransport (>= 5.1.1, ~> 5.1)
43+
- GoogleDataTransportCCTSupport (>= 2.0.2, ~> 2.0)
44+
- nanopb (~> 0.3.901)
45+
- PromisesObjC (~> 1.2)
46+
- FirebaseInstallations (1.1.1):
47+
- FirebaseCore (~> 6.6)
48+
- GoogleUtilities/UserDefaults (~> 6.5)
49+
- PromisesObjC (~> 1.2)
50+
- FirebaseStorage (3.6.0):
51+
- FirebaseAuthInterop (~> 1.1)
52+
- FirebaseCore (~> 6.6)
4153
- GTMSessionFetcher/Core (~> 1.1)
42-
- Google-Mobile-Ads-SDK (7.57.0):
54+
- Google-Mobile-Ads-SDK (7.58.0):
4355
- GoogleAppMeasurement (~> 6.0)
44-
- GoogleAppMeasurement (6.1.2):
56+
- GoogleAppMeasurement (6.4.1):
4557
- GoogleUtilities/AppDelegateSwizzler (~> 6.0)
4658
- GoogleUtilities/MethodSwizzler (~> 6.0)
4759
- GoogleUtilities/Network (~> 6.0)
4860
- "GoogleUtilities/NSData+zlib (~> 6.0)"
49-
- nanopb (~> 0.3)
50-
- GoogleDataTransport (2.0.0)
51-
- GoogleDataTransportCCTSupport (1.1.0):
52-
- GoogleDataTransport (~> 2.0)
53-
- nanopb
54-
- GoogleUtilities/AppDelegateSwizzler (6.3.1):
61+
- nanopb (= 0.3.9011)
62+
- GoogleDataTransport (5.1.1)
63+
- GoogleDataTransportCCTSupport (2.0.2):
64+
- GoogleDataTransport (~> 5.1)
65+
- nanopb (~> 0.3.901)
66+
- GoogleUtilities/AppDelegateSwizzler (6.5.2):
5567
- GoogleUtilities/Environment
5668
- GoogleUtilities/Logger
5769
- GoogleUtilities/Network
58-
- GoogleUtilities/Environment (6.3.1)
59-
- GoogleUtilities/Logger (6.3.1):
70+
- GoogleUtilities/Environment (6.5.2)
71+
- GoogleUtilities/Logger (6.5.2):
6072
- GoogleUtilities/Environment
61-
- GoogleUtilities/MethodSwizzler (6.3.1):
73+
- GoogleUtilities/MethodSwizzler (6.5.2):
6274
- GoogleUtilities/Logger
63-
- GoogleUtilities/Network (6.3.1):
75+
- GoogleUtilities/Network (6.5.2):
6476
- GoogleUtilities/Logger
6577
- "GoogleUtilities/NSData+zlib"
6678
- GoogleUtilities/Reachability
67-
- "GoogleUtilities/NSData+zlib (6.3.1)"
68-
- GoogleUtilities/Reachability (6.3.1):
79+
- "GoogleUtilities/NSData+zlib (6.5.2)"
80+
- GoogleUtilities/Reachability (6.5.2):
6981
- GoogleUtilities/Logger
70-
- GoogleUtilities/UserDefaults (6.3.1):
82+
- GoogleUtilities/UserDefaults (6.5.2):
7183
- GoogleUtilities/Logger
72-
- GTMSessionFetcher/Core (1.2.2)
73-
- nanopb (0.3.901):
74-
- nanopb/decode (= 0.3.901)
75-
- nanopb/encode (= 0.3.901)
76-
- nanopb/decode (0.3.901)
77-
- nanopb/encode (0.3.901)
84+
- GTMSessionFetcher/Core (1.3.1)
85+
- nanopb (0.3.9011):
86+
- nanopb/decode (= 0.3.9011)
87+
- nanopb/encode (= 0.3.9011)
88+
- nanopb/decode (0.3.9011)
89+
- nanopb/encode (0.3.9011)
90+
- PromisesObjC (1.2.8)
7891
- ScrollableSegmentedControl (1.5.0)
7992

8093
DEPENDENCIES:
81-
- Crashlytics
82-
- Fabric
94+
- Firebase/Analytics
8395
- Firebase/Core
96+
- Firebase/Crashlytics
8497
- Firebase/Storage
8598
- Google-Mobile-Ads-SDK
8699
- ScrollableSegmentedControl
87100

88101
SPEC REPOS:
89102
trunk:
90-
- Crashlytics
91-
- Fabric
92103
- Firebase
93104
- FirebaseAnalytics
105+
- FirebaseAnalyticsInterop
94106
- FirebaseAuthInterop
95107
- FirebaseCore
96108
- FirebaseCoreDiagnostics
97109
- FirebaseCoreDiagnosticsInterop
98-
- FirebaseInstanceID
110+
- FirebaseCrashlytics
111+
- FirebaseInstallations
99112
- FirebaseStorage
100113
- Google-Mobile-Ads-SDK
101114
- GoogleAppMeasurement
@@ -104,28 +117,30 @@ SPEC REPOS:
104117
- GoogleUtilities
105118
- GTMSessionFetcher
106119
- nanopb
120+
- PromisesObjC
107121
- ScrollableSegmentedControl
108122

109123
SPEC CHECKSUMS:
110-
Crashlytics: 540b7e5f5da5a042647227a5e3ac51d85eed06df
111-
Fabric: 706c8b8098fff96c33c0db69cbf81f9c551d0d74
112-
Firebase: 2d750c54cda57d5a6ae31212cfe5cc813c6be7e4
113-
FirebaseAnalytics: 5d9ccbf46ed25d3ec9304d263f85bddf1e93e2d2
114-
FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc
115-
FirebaseCore: 8b2765c445d40db7137989b7146a3aa3f91b5529
116-
FirebaseCoreDiagnostics: be4f7a09d02ab305f18de59a470412caddb64c2a
117-
FirebaseCoreDiagnosticsInterop: 6829da2b8d1fc795ff1bd99df751d3788035d2cb
118-
FirebaseInstanceID: 550df9be1f99f751d8fcde3ac342a1e21a0e6c42
119-
FirebaseStorage: b7c6d00997bc21d4465453bdcc5cc65513110fed
120-
Google-Mobile-Ads-SDK: ec897018b9ab9b447e7aa4876e7f75aba13ba2de
121-
GoogleAppMeasurement: 0ae90be1cc4dad40f4a27fc767ef59fa032ec87b
122-
GoogleDataTransport: c8617c00e4f3eb9418e42ac0e8ac5241a9d555dd
123-
GoogleDataTransportCCTSupport: 9f352523e8785a71f6754f51eeff09f49ec19268
124-
GoogleUtilities: f895fde57977df4e0233edda0dbeac490e3703b6
125-
GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23
126-
nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
124+
Firebase: 32f9520684e87c7af3f0704f7f88042626d6b536
125+
FirebaseAnalytics: 83f822fd0d33a46f49f89b8c3ab16ab4d89df08a
126+
FirebaseAnalyticsInterop: 3f86269c38ae41f47afeb43ebf32a001f58fcdae
127+
FirebaseAuthInterop: a0f37ae05833af156e72028f648d313f7e7592e9
128+
FirebaseCore: 9aca0f1fffb405176ba15311a5621fcde4106fcf
129+
FirebaseCoreDiagnostics: 13a6564cd6d5375066bbc8940cc1753af24497f3
130+
FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850
131+
FirebaseCrashlytics: ad2e8527a7efd9a7e708d5abe57318ced2e1dbd1
132+
FirebaseInstallations: acb3216eb9784d3b1d2d2d635ff74fa892cc0c44
133+
FirebaseStorage: b43ee271294227e1a3225544b073f3b49b427f46
134+
Google-Mobile-Ads-SDK: 7052557293c75c676db55feb707ace9b790f32c1
135+
GoogleAppMeasurement: e49be3954045b17d046f271b9cc1ec052bad9702
136+
GoogleDataTransport: 6ffa4dd0b6d547f8d27b91bd92fa9e197a3f5f1f
137+
GoogleDataTransportCCTSupport: 12f02e5c8f09c055615de90bcd5ba2c375546051
138+
GoogleUtilities: ad0f3b691c67909d03a3327cc205222ab8f42e0e
139+
GTMSessionFetcher: cea130bbfe5a7edc8d06d3f0d17288c32ffe9925
140+
nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd
141+
PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6
127142
ScrollableSegmentedControl: 2e64bbe8968a7fcd8aae5014434481464fcdfe60
128143

129-
PODFILE CHECKSUM: 58f4adbb7aa85cdb51dbaa345c2156c2b0ce33b5
144+
PODFILE CHECKSUM: 29b95d485a27c81711e78d9b14662503a45807e8
130145

131146
COCOAPODS: 1.9.1

0 commit comments

Comments
 (0)