Skip to content

Commit 6208093

Browse files
committed
Fix every second extension load crash on iOS.
1 parent ecb5b7e commit 6208093

File tree

1 file changed

+89
-56
lines changed

1 file changed

+89
-56
lines changed

patches/react-native-share-menu+6.0.0.patch

Lines changed: 89 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/node_modules/react-native-share-menu/android/build.gradle b/node_modules/react-native-share-menu/android/build.gradle
2-
index 9557fdb..235d476 100644
2+
index 9557fdb..cdd59b6 100644
33
--- a/node_modules/react-native-share-menu/android/build.gradle
44
+++ b/node_modules/react-native-share-menu/android/build.gradle
55
@@ -1,12 +1,22 @@
@@ -47,20 +47,16 @@ index 0000000..5ff383e
4747
+o/debug
4848
diff --git a/node_modules/react-native-share-menu/android/build/.transforms/0a1c2b17663dff912f25a7c19926bbf5/transformed/debug/com/meedan/BuildConfig.dex b/node_modules/react-native-share-menu/android/build/.transforms/0a1c2b17663dff912f25a7c19926bbf5/transformed/debug/com/meedan/BuildConfig.dex
4949
new file mode 100644
50-
index 0000000..798a105
51-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/.transforms/0a1c2b17663dff912f25a7c19926bbf5/transformed/debug/com/meedan/BuildConfig.dex differ
50+
index 0000000..e69de29
5251
diff --git a/node_modules/react-native-share-menu/android/build/.transforms/0a1c2b17663dff912f25a7c19926bbf5/transformed/debug/com/meedan/ShareMenuModule.dex b/node_modules/react-native-share-menu/android/build/.transforms/0a1c2b17663dff912f25a7c19926bbf5/transformed/debug/com/meedan/ShareMenuModule.dex
5352
new file mode 100644
54-
index 0000000..a93208c
55-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/.transforms/0a1c2b17663dff912f25a7c19926bbf5/transformed/debug/com/meedan/ShareMenuModule.dex differ
53+
index 0000000..e69de29
5654
diff --git a/node_modules/react-native-share-menu/android/build/.transforms/0a1c2b17663dff912f25a7c19926bbf5/transformed/debug/com/meedan/ShareMenuPackage.dex b/node_modules/react-native-share-menu/android/build/.transforms/0a1c2b17663dff912f25a7c19926bbf5/transformed/debug/com/meedan/ShareMenuPackage.dex
5755
new file mode 100644
58-
index 0000000..d286ad4
59-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/.transforms/0a1c2b17663dff912f25a7c19926bbf5/transformed/debug/com/meedan/ShareMenuPackage.dex differ
56+
index 0000000..e69de29
6057
diff --git a/node_modules/react-native-share-menu/android/build/.transforms/0a1c2b17663dff912f25a7c19926bbf5/transformed/desugar_graph.bin b/node_modules/react-native-share-menu/android/build/.transforms/0a1c2b17663dff912f25a7c19926bbf5/transformed/desugar_graph.bin
6158
new file mode 100644
62-
index 0000000..601f245
63-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/.transforms/0a1c2b17663dff912f25a7c19926bbf5/transformed/desugar_graph.bin differ
59+
index 0000000..e69de29
6460
diff --git a/node_modules/react-native-share-menu/android/build/.transforms/a869a400588114283ef83ef4af5fab25/results.bin b/node_modules/react-native-share-menu/android/build/.transforms/a869a400588114283ef83ef4af5fab25/results.bin
6561
new file mode 100644
6662
index 0000000..9e53e72
@@ -70,20 +66,16 @@ index 0000000..9e53e72
7066
+o/release
7167
diff --git a/node_modules/react-native-share-menu/android/build/.transforms/a869a400588114283ef83ef4af5fab25/transformed/desugar_graph.bin b/node_modules/react-native-share-menu/android/build/.transforms/a869a400588114283ef83ef4af5fab25/transformed/desugar_graph.bin
7268
new file mode 100644
73-
index 0000000..601f245
74-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/.transforms/a869a400588114283ef83ef4af5fab25/transformed/desugar_graph.bin differ
69+
index 0000000..e69de29
7570
diff --git a/node_modules/react-native-share-menu/android/build/.transforms/a869a400588114283ef83ef4af5fab25/transformed/release/com/meedan/BuildConfig.dex b/node_modules/react-native-share-menu/android/build/.transforms/a869a400588114283ef83ef4af5fab25/transformed/release/com/meedan/BuildConfig.dex
7671
new file mode 100644
77-
index 0000000..007f8f1
78-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/.transforms/a869a400588114283ef83ef4af5fab25/transformed/release/com/meedan/BuildConfig.dex differ
72+
index 0000000..e69de29
7973
diff --git a/node_modules/react-native-share-menu/android/build/.transforms/a869a400588114283ef83ef4af5fab25/transformed/release/com/meedan/ShareMenuModule.dex b/node_modules/react-native-share-menu/android/build/.transforms/a869a400588114283ef83ef4af5fab25/transformed/release/com/meedan/ShareMenuModule.dex
8074
new file mode 100644
81-
index 0000000..96d67f6
82-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/.transforms/a869a400588114283ef83ef4af5fab25/transformed/release/com/meedan/ShareMenuModule.dex differ
75+
index 0000000..e69de29
8376
diff --git a/node_modules/react-native-share-menu/android/build/.transforms/a869a400588114283ef83ef4af5fab25/transformed/release/com/meedan/ShareMenuPackage.dex b/node_modules/react-native-share-menu/android/build/.transforms/a869a400588114283ef83ef4af5fab25/transformed/release/com/meedan/ShareMenuPackage.dex
8477
new file mode 100644
85-
index 0000000..e37563c
86-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/.transforms/a869a400588114283ef83ef4af5fab25/transformed/release/com/meedan/ShareMenuPackage.dex differ
78+
index 0000000..e69de29
8779
diff --git a/node_modules/react-native-share-menu/android/build/.transforms/cd56ea2bf14f92f3dee54c4f4f89050e/results.bin b/node_modules/react-native-share-menu/android/build/.transforms/cd56ea2bf14f92f3dee54c4f4f89050e/results.bin
8880
new file mode 100644
8981
index 0000000..1ed65e0
@@ -248,20 +240,16 @@ index 0000000..9e26dfe
248240
\ No newline at end of file
249241
diff --git a/node_modules/react-native-share-menu/android/build/intermediates/compile_library_classes_jar/debug/classes.jar b/node_modules/react-native-share-menu/android/build/intermediates/compile_library_classes_jar/debug/classes.jar
250242
new file mode 100644
251-
index 0000000..3bdf6d4
252-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/intermediates/compile_library_classes_jar/debug/classes.jar differ
243+
index 0000000..e69de29
253244
diff --git a/node_modules/react-native-share-menu/android/build/intermediates/compile_library_classes_jar/release/classes.jar b/node_modules/react-native-share-menu/android/build/intermediates/compile_library_classes_jar/release/classes.jar
254245
new file mode 100644
255-
index 0000000..55d06df
256-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/intermediates/compile_library_classes_jar/release/classes.jar differ
246+
index 0000000..e69de29
257247
diff --git a/node_modules/react-native-share-menu/android/build/intermediates/compile_r_class_jar/debug/R.jar b/node_modules/react-native-share-menu/android/build/intermediates/compile_r_class_jar/debug/R.jar
258248
new file mode 100644
259-
index 0000000..f49897b
260-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/intermediates/compile_r_class_jar/debug/R.jar differ
249+
index 0000000..e69de29
261250
diff --git a/node_modules/react-native-share-menu/android/build/intermediates/compile_r_class_jar/release/R.jar b/node_modules/react-native-share-menu/android/build/intermediates/compile_r_class_jar/release/R.jar
262251
new file mode 100644
263-
index 0000000..f49897b
264-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/intermediates/compile_r_class_jar/release/R.jar differ
252+
index 0000000..e69de29
265253
diff --git a/node_modules/react-native-share-menu/android/build/intermediates/compile_symbol_list/debug/R.txt b/node_modules/react-native-share-menu/android/build/intermediates/compile_symbol_list/debug/R.txt
266254
new file mode 100644
267255
index 0000000..5347f17
@@ -4270,28 +4258,22 @@ index 0000000..1cf1ca3
42704258
\ No newline at end of file
42714259
diff --git a/node_modules/react-native-share-menu/android/build/intermediates/javac/debug/classes/com/meedan/BuildConfig.class b/node_modules/react-native-share-menu/android/build/intermediates/javac/debug/classes/com/meedan/BuildConfig.class
42724260
new file mode 100644
4273-
index 0000000..e42e91a
4274-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/intermediates/javac/debug/classes/com/meedan/BuildConfig.class differ
4261+
index 0000000..e69de29
42754262
diff --git a/node_modules/react-native-share-menu/android/build/intermediates/javac/debug/classes/com/meedan/ShareMenuModule.class b/node_modules/react-native-share-menu/android/build/intermediates/javac/debug/classes/com/meedan/ShareMenuModule.class
42764263
new file mode 100644
4277-
index 0000000..6aa1cb6
4278-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/intermediates/javac/debug/classes/com/meedan/ShareMenuModule.class differ
4264+
index 0000000..e69de29
42794265
diff --git a/node_modules/react-native-share-menu/android/build/intermediates/javac/debug/classes/com/meedan/ShareMenuPackage.class b/node_modules/react-native-share-menu/android/build/intermediates/javac/debug/classes/com/meedan/ShareMenuPackage.class
42804266
new file mode 100644
4281-
index 0000000..451cb9c
4282-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/intermediates/javac/debug/classes/com/meedan/ShareMenuPackage.class differ
4267+
index 0000000..e69de29
42834268
diff --git a/node_modules/react-native-share-menu/android/build/intermediates/javac/release/classes/com/meedan/BuildConfig.class b/node_modules/react-native-share-menu/android/build/intermediates/javac/release/classes/com/meedan/BuildConfig.class
42844269
new file mode 100644
4285-
index 0000000..be1b7b8
4286-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/intermediates/javac/release/classes/com/meedan/BuildConfig.class differ
4270+
index 0000000..e69de29
42874271
diff --git a/node_modules/react-native-share-menu/android/build/intermediates/javac/release/classes/com/meedan/ShareMenuModule.class b/node_modules/react-native-share-menu/android/build/intermediates/javac/release/classes/com/meedan/ShareMenuModule.class
42884272
new file mode 100644
4289-
index 0000000..6aa1cb6
4290-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/intermediates/javac/release/classes/com/meedan/ShareMenuModule.class differ
4273+
index 0000000..e69de29
42914274
diff --git a/node_modules/react-native-share-menu/android/build/intermediates/javac/release/classes/com/meedan/ShareMenuPackage.class b/node_modules/react-native-share-menu/android/build/intermediates/javac/release/classes/com/meedan/ShareMenuPackage.class
42924275
new file mode 100644
4293-
index 0000000..451cb9c
4294-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/intermediates/javac/release/classes/com/meedan/ShareMenuPackage.class differ
4276+
index 0000000..e69de29
42954277
diff --git a/node_modules/react-native-share-menu/android/build/intermediates/local_only_symbol_list/debug/R-def.txt b/node_modules/react-native-share-menu/android/build/intermediates/local_only_symbol_list/debug/R-def.txt
42964278
new file mode 100644
42974279
index 0000000..78ac5b8
@@ -4432,28 +4414,22 @@ index 0000000..537a78c
44324414
\ No newline at end of file
44334415
diff --git a/node_modules/react-native-share-menu/android/build/intermediates/runtime_library_classes_dir/debug/com/meedan/BuildConfig.class b/node_modules/react-native-share-menu/android/build/intermediates/runtime_library_classes_dir/debug/com/meedan/BuildConfig.class
44344416
new file mode 100644
4435-
index 0000000..e42e91a
4436-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/intermediates/runtime_library_classes_dir/debug/com/meedan/BuildConfig.class differ
4417+
index 0000000..e69de29
44374418
diff --git a/node_modules/react-native-share-menu/android/build/intermediates/runtime_library_classes_dir/debug/com/meedan/ShareMenuModule.class b/node_modules/react-native-share-menu/android/build/intermediates/runtime_library_classes_dir/debug/com/meedan/ShareMenuModule.class
44384419
new file mode 100644
4439-
index 0000000..6aa1cb6
4440-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/intermediates/runtime_library_classes_dir/debug/com/meedan/ShareMenuModule.class differ
4420+
index 0000000..e69de29
44414421
diff --git a/node_modules/react-native-share-menu/android/build/intermediates/runtime_library_classes_dir/debug/com/meedan/ShareMenuPackage.class b/node_modules/react-native-share-menu/android/build/intermediates/runtime_library_classes_dir/debug/com/meedan/ShareMenuPackage.class
44424422
new file mode 100644
4443-
index 0000000..451cb9c
4444-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/intermediates/runtime_library_classes_dir/debug/com/meedan/ShareMenuPackage.class differ
4423+
index 0000000..e69de29
44454424
diff --git a/node_modules/react-native-share-menu/android/build/intermediates/runtime_library_classes_dir/release/com/meedan/BuildConfig.class b/node_modules/react-native-share-menu/android/build/intermediates/runtime_library_classes_dir/release/com/meedan/BuildConfig.class
44464425
new file mode 100644
4447-
index 0000000..be1b7b8
4448-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/intermediates/runtime_library_classes_dir/release/com/meedan/BuildConfig.class differ
4426+
index 0000000..e69de29
44494427
diff --git a/node_modules/react-native-share-menu/android/build/intermediates/runtime_library_classes_dir/release/com/meedan/ShareMenuModule.class b/node_modules/react-native-share-menu/android/build/intermediates/runtime_library_classes_dir/release/com/meedan/ShareMenuModule.class
44504428
new file mode 100644
4451-
index 0000000..6aa1cb6
4452-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/intermediates/runtime_library_classes_dir/release/com/meedan/ShareMenuModule.class differ
4429+
index 0000000..e69de29
44534430
diff --git a/node_modules/react-native-share-menu/android/build/intermediates/runtime_library_classes_dir/release/com/meedan/ShareMenuPackage.class b/node_modules/react-native-share-menu/android/build/intermediates/runtime_library_classes_dir/release/com/meedan/ShareMenuPackage.class
44544431
new file mode 100644
4455-
index 0000000..451cb9c
4456-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/intermediates/runtime_library_classes_dir/release/com/meedan/ShareMenuPackage.class differ
4432+
index 0000000..e69de29
44574433
diff --git a/node_modules/react-native-share-menu/android/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt b/node_modules/react-native-share-menu/android/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt
44584434
new file mode 100644
44594435
index 0000000..0d23775
@@ -7424,17 +7400,39 @@ index 0000000..60f940f
74247400
+ INJECTED from /Users/vincentritter/Dev/micro_blog/MicroBlog.RN/node_modules/react-native-share-menu/android/src/main/AndroidManifest.xml
74257401
diff --git a/node_modules/react-native-share-menu/android/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/node_modules/react-native-share-menu/android/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
74267402
new file mode 100644
7427-
index 0000000..a7c13e3
7428-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ
7403+
index 0000000..e69de29
74297404
diff --git a/node_modules/react-native-share-menu/android/build/tmp/compileReleaseJavaWithJavac/previous-compilation-data.bin b/node_modules/react-native-share-menu/android/build/tmp/compileReleaseJavaWithJavac/previous-compilation-data.bin
74307405
new file mode 100644
7431-
index 0000000..040d38f
7432-
Binary files /dev/null and b/node_modules/react-native-share-menu/android/build/tmp/compileReleaseJavaWithJavac/previous-compilation-data.bin differ
7406+
index 0000000..e69de29
74337407
diff --git a/node_modules/react-native-share-menu/ios/Modules/ShareMenuReactView.swift b/node_modules/react-native-share-menu/ios/Modules/ShareMenuReactView.swift
7434-
index e290cce..260def2 100644
7408+
index e290cce..6dd48ca 100644
74357409
--- a/node_modules/react-native-share-menu/ios/Modules/ShareMenuReactView.swift
74367410
+++ b/node_modules/react-native-share-menu/ios/Modules/ShareMenuReactView.swift
7437-
@@ -159,9 +159,26 @@ public class ShareMenuReactView: NSObject {
7411+
@@ -45,6 +45,7 @@ public class ShareMenuReactView: NSObject {
7412+
}
7413+
7414+
extensionContext.completeRequest(returningItems: [], completionHandler: nil)
7415+
+ ShareMenuReactView.detachViewDelegate()
7416+
}
7417+
7418+
@objc
7419+
@@ -55,6 +56,7 @@ public class ShareMenuReactView: NSObject {
7420+
}
7421+
7422+
viewDelegate.openApp()
7423+
+ ShareMenuReactView.detachViewDelegate()
7424+
}
7425+
7426+
@objc(continueInApp:)
7427+
@@ -72,6 +74,7 @@ public class ShareMenuReactView: NSObject {
7428+
}
7429+
7430+
viewDelegate.continueInApp(with: items, and: extraData)
7431+
+ ShareMenuReactView.detachViewDelegate()
7432+
}
7433+
7434+
@objc(data:reject:)
7435+
@@ -159,9 +162,26 @@ public class ShareMenuReactView: NSObject {
74387436
semaphore.wait()
74397437
} else if provider.hasItemConformingToTypeIdentifier(kUTTypeData as String) {
74407438
provider.loadItem(forTypeIdentifier: kUTTypeData as String, options: nil) { (item, error) in
@@ -7464,7 +7462,7 @@ index e290cce..260def2 100644
74647462
semaphore.signal()
74657463
}
74667464
diff --git a/node_modules/react-native-share-menu/ios/ReactShareViewController.swift b/node_modules/react-native-share-menu/ios/ReactShareViewController.swift
7467-
index f42bce6..ee36062 100644
7465+
index f42bce6..9cc5d3b 100644
74687466
--- a/node_modules/react-native-share-menu/ios/ReactShareViewController.swift
74697467
+++ b/node_modules/react-native-share-menu/ios/ReactShareViewController.swift
74707468
@@ -13,7 +13,7 @@ class ReactShareViewController: ShareViewController, RCTBridgeDelegate, ReactSha
@@ -7476,3 +7474,38 @@ index f42bce6..ee36062 100644
74767474
#else
74777475
return Bundle.main.url(forResource: "main", withExtension: "jsbundle")
74787476
#endif
7477+
@@ -50,12 +50,17 @@ class ReactShareViewController: ShareViewController, RCTBridgeDelegate, ReactSha
7478+
}
7479+
7480+
override func viewDidDisappear(_ animated: Bool) {
7481+
- cancel()
7482+
+ // cancel()
7483+
ShareMenuReactView.detachViewDelegate()
7484+
}
7485+
7486+
func loadExtensionContext() -> NSExtensionContext {
7487+
- return extensionContext!
7488+
+ guard let context = extensionContext else {
7489+
+ // Handle the case where extensionContext is nil
7490+
+ // For example, you could return a default value or throw an error
7491+
+ fatalError("extensionContext is nil")
7492+
+ }
7493+
+ return context
7494+
}
7495+
7496+
func openApp() {
7497+
diff --git a/node_modules/react-native-share-menu/ios/ShareViewController.swift b/node_modules/react-native-share-menu/ios/ShareViewController.swift
7498+
index 12d8c92..d599676 100644
7499+
--- a/node_modules/react-native-share-menu/ios/ShareViewController.swift
7500+
+++ b/node_modules/react-native-share-menu/ios/ShareViewController.swift
7501+
@@ -40,6 +40,10 @@ class ShareViewController: SLComposeServiceViewController {
7502+
return true
7503+
}
7504+
7505+
+ override func loadPreviewView() -> UIView! {
7506+
+ return nil
7507+
+ }
7508+
+
7509+
override func didSelectPost() {
7510+
// This is called after the user selects Post. Do the upload of contentText and/or NSExtensionContext attachments.
7511+
guard let items = extensionContext?.inputItems as? [NSExtensionItem] else {

0 commit comments

Comments
 (0)