Skip to content

Commit 3c8418d

Browse files
hawkriveshawkrives
authored
Merge pull request #2144 from StoDevX/remove-push
Remove push notifications from the app
2 parents e0083fc + 9dd5feb commit 3c8418d

File tree

12 files changed

+3
-114
lines changed

12 files changed

+3
-114
lines changed

‎android/app/build.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ android {
111111
}
112112
manifestPlaceholders = [
113113
manifestApplicationId: applicationId,
114-
onesignal_app_id: "aa46a500-ab1c-4127-b9ff-e7373da3ce35",
115-
onesignal_google_project_number: "185558680648",
116114
gmaps_key: System.getenv("GMAPS_KEY") ?: "",
117115
]
118116
}
@@ -201,7 +199,6 @@ dependencies {
201199
compile project(':react-native-linear-gradient')
202200
compile project(':react-native-maps')
203201
compile project(':react-native-network-info')
204-
compile project(':react-native-onesignal')
205202
compile project(':react-native-restart')
206203
compile project(':react-native-vector-icons')
207204
// this is for react-native itself

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33

44
<uses-permission android:name="android.permission.INTERNET" />
55
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
6-
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> <!-- FINE_LOCATION is used for wifi reporting, and can be used for targetted OneSignal notifications -->
6+
<!-- FINE_LOCATION is used for wifi reporting -->
7+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
78
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
89

910
<application

‎android/app/src/main/java/com/allaboutolaf/MainApplication.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import com.facebook.react.ReactPackage;
1818
import com.facebook.react.shell.MainReactPackage;
1919
import com.facebook.soloader.SoLoader;
20-
import com.geektime.rnonesignalandroid.ReactNativeOneSignalPackage;
2120
import com.github.droibit.android.reactnative.customtabs.CustomTabsPackage;
2221
import com.idehub.GoogleAnalyticsBridge.GoogleAnalyticsBridgePackage;
2322
import com.learnium.RNDeviceInfo.RNDeviceInfo;
@@ -50,7 +49,6 @@ protected List<ReactPackage> getPackages() {
5049
new KeychainPackage(),
5150
new LinearGradientPackage(),
5251
new MapsPackage(),
53-
new ReactNativeOneSignalPackage(),
5452
new ReactNativeRestartPackage(),
5553
new RNDeviceInfo(),
5654
new RNNetworkInfoPackage(),

‎android/settings.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ project(':react-native-maps').projectDir = new File(rootProject.projectDir, '../
2929
include ':react-native-network-info'
3030
project(':react-native-network-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-network-info/android')
3131

32-
include ':react-native-onesignal'
33-
project(':react-native-onesignal').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-onesignal/android')
34-
3532
include ':react-native-restart'
3633
project(':react-native-restart').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-restart/android')
3734

‎ios/AllAboutOlaf.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
00E9BA601FBBB58600E0DFCD /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0027B0A71D5C82AA00C2B4FD /* libRNVectorIcons.a */; };
2626
00E9BA611FBBB59900E0DFCD /* libRNDeviceInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A9B26591DE3709F00B6A428 /* libRNDeviceInfo.a */; };
2727
00E9BA621FBBB5B200E0DFCD /* libRCTGoogleAnalyticsBridge.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 000296051E270B8A000909F2 /* libRCTGoogleAnalyticsBridge.a */; };
28-
00E9BA631FBBB5BE00E0DFCD /* libRCTOneSignal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00158A901E4FAE9E00F78C7B /* libRCTOneSignal.a */; };
2928
00E9BA641FBBB5C800E0DFCD /* libRNKeychain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00158AA31E4FAE9E00F78C7B /* libRNKeychain.a */; };
3029
00E9BA651FBBB5CF00E0DFCD /* libSafariViewManager.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009845C11E5DEE6800194E4A /* libSafariViewManager.a */; };
3130
00E9BA661FBBB5D900E0DFCD /* libDBCustomTabs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009845B91E5DEE6800194E4A /* libDBCustomTabs.a */; };
@@ -59,13 +58,6 @@
5958
remoteGlobalIDString = A79185C61C30694E001236A6;
6059
remoteInfo = RCTGoogleAnalyticsBridge;
6160
};
62-
00158A8F1E4FAE9E00F78C7B /* PBXContainerItemProxy */ = {
63-
isa = PBXContainerItemProxy;
64-
containerPortal = 916377371C784A9B8A7A1F5C /* RCTOneSignal.xcodeproj */;
65-
proxyType = 2;
66-
remoteGlobalIDString = 3245CDED1BFEE35C00EABF68;
67-
remoteInfo = RCTOneSignal;
68-
};
6961
00158AA21E4FAE9E00F78C7B /* PBXContainerItemProxy */ = {
7062
isa = PBXContainerItemProxy;
7163
containerPortal = 2560C43708D64866AA01FCC8 /* RNKeychain.xcodeproj */;
@@ -466,7 +458,6 @@
466458
00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = "../node_modules/react-native/Libraries/Image/RCTImage.xcodeproj"; sourceTree = "<group>"; };
467459
00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = "../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj"; sourceTree = "<group>"; };
468460
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = "../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj"; sourceTree = "<group>"; };
469-
00C8CB4C1D6EBA1A00E66E20 /* All About Olaf.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = "All About Olaf.entitlements"; path = "AllAboutOlaf/All About Olaf.entitlements"; sourceTree = "<group>"; };
470461
00D33BDF1DDA58A8001E830E /* AllAboutOlafUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AllAboutOlafUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
471462
00D33BE11DDA58A8001E830E /* AllAboutOlafUITests.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = AllAboutOlafUITests.swift; sourceTree = "<group>"; };
472463
00D33BE31DDA58A8001E830E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -499,7 +490,6 @@
499490
828A2E49D4E3430FB2853AFF /* RNDeviceInfo.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNDeviceInfo.xcodeproj; path = "../node_modules/react-native-device-info/RNDeviceInfo.xcodeproj"; sourceTree = "<group>"; };
500491
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
501492
89FC2AFC0A394CFFAE89242D /* SafariViewManager.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = SafariViewManager.xcodeproj; path = "../node_modules/react-native-safari-view/SafariViewManager.xcodeproj"; sourceTree = "<group>"; };
502-
916377371C784A9B8A7A1F5C /* RCTOneSignal.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RCTOneSignal.xcodeproj; path = "../node_modules/react-native-onesignal/ios/RCTOneSignal.xcodeproj"; sourceTree = "<group>"; };
503493
A91038679F834707B769D282 /* RNKeychain.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNKeychain.xcodeproj; path = "../node_modules/react-native-keychain/RNKeychain.xcodeproj"; sourceTree = "<group>"; };
504494
C1122D5F37D247E09037EE31 /* BVLinearGradient.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = BVLinearGradient.xcodeproj; path = "../node_modules/react-native-linear-gradient/BVLinearGradient.xcodeproj"; sourceTree = "<group>"; };
505495
CE0A6E16923B40C9930B546C /* ReactNativeCustomTabs.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeCustomTabs.xcodeproj; path = "../node_modules/react-native-custom-tabs/ios/ReactNativeCustomTabs.xcodeproj"; sourceTree = "<group>"; };
@@ -541,7 +531,6 @@
541531
00E9BA601FBBB58600E0DFCD /* libRNVectorIcons.a in Frameworks */,
542532
00E9BA611FBBB59900E0DFCD /* libRNDeviceInfo.a in Frameworks */,
543533
00E9BA621FBBB5B200E0DFCD /* libRCTGoogleAnalyticsBridge.a in Frameworks */,
544-
00E9BA631FBBB5BE00E0DFCD /* libRCTOneSignal.a in Frameworks */,
545534
00E9BA641FBBB5C800E0DFCD /* libRNKeychain.a in Frameworks */,
546535
00E9BA651FBBB5CF00E0DFCD /* libSafariViewManager.a in Frameworks */,
547536
00E9BA661FBBB5D900E0DFCD /* libDBCustomTabs.a in Frameworks */,
@@ -575,14 +564,6 @@
575564
name = Products;
576565
sourceTree = "<group>";
577566
};
578-
00158A811E4FAE9E00F78C7B /* Products */ = {
579-
isa = PBXGroup;
580-
children = (
581-
00158A901E4FAE9E00F78C7B /* libRCTOneSignal.a */,
582-
);
583-
name = Products;
584-
sourceTree = "<group>";
585-
};
586567
0015CC921FC21C33009C3A73 /* Products */ = {
587568
isa = PBXGroup;
588569
children = (
@@ -764,7 +745,6 @@
764745
13B07FB01A68108700A75B9A /* AppDelegate.m */,
765746
3AE4084F1E1E280800F0FD83 /* LaunchScreen.storyboard */,
766747
13B07FB51A68108700A75B9A /* Images.xcassets */,
767-
00C8CB4C1D6EBA1A00E66E20 /* All About Olaf.entitlements */,
768748
008F07F21AC5B25A0029DE68 /* main.jsbundle */,
769749
13B07FB71A68108700A75B9A /* main.m */,
770750
);
@@ -875,7 +855,6 @@
875855
00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */,
876856
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */,
877857
00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */,
878-
916377371C784A9B8A7A1F5C /* RCTOneSignal.xcodeproj */,
879858
DBE3B3C3883845C787D391C2 /* RCTRestart.xcodeproj */,
880859
139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */,
881860
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
@@ -990,7 +969,7 @@
990969
enabled = 1;
991970
};
992971
com.apple.Push = {
993-
enabled = 1;
972+
enabled = 0;
994973
};
995974
};
996975
};
@@ -1048,10 +1027,6 @@
10481027
ProductGroup = 00C302D41ABCB9D200DB3ED1 /* Products */;
10491028
ProjectRef = 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */;
10501029
},
1051-
{
1052-
ProductGroup = 00158A811E4FAE9E00F78C7B /* Products */;
1053-
ProjectRef = 916377371C784A9B8A7A1F5C /* RCTOneSignal.xcodeproj */;
1054-
},
10551030
{
10561031
ProductGroup = 006118441EE51CD100638440 /* Products */;
10571032
ProjectRef = DBE3B3C3883845C787D391C2 /* RCTRestart.xcodeproj */;
@@ -1137,13 +1112,6 @@
11371112
remoteRef = 000296041E270B8A000909F2 /* PBXContainerItemProxy */;
11381113
sourceTree = BUILT_PRODUCTS_DIR;
11391114
};
1140-
00158A901E4FAE9E00F78C7B /* libRCTOneSignal.a */ = {
1141-
isa = PBXReferenceProxy;
1142-
fileType = archive.ar;
1143-
path = libRCTOneSignal.a;
1144-
remoteRef = 00158A8F1E4FAE9E00F78C7B /* PBXContainerItemProxy */;
1145-
sourceTree = BUILT_PRODUCTS_DIR;
1146-
};
11471115
00158AA31E4FAE9E00F78C7B /* libRNKeychain.a */ = {
11481116
isa = PBXReferenceProxy;
11491117
fileType = archive.ar;
@@ -1659,7 +1627,6 @@
16591627
buildSettings = {
16601628
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
16611629
CLANG_ENABLE_MODULES = YES;
1662-
CODE_SIGN_ENTITLEMENTS = "AllAboutOlaf/All About Olaf.entitlements";
16631630
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Hawken Rives (TMK6S7TPX2)";
16641631
CODE_SIGN_STYLE = Manual;
16651632
DEAD_CODE_STRIPPING = NO;
@@ -1672,10 +1639,8 @@
16721639
"$(SRCROOT)/../node_modules/react-native/ReactCommon/**",
16731640
"$(SRCROOT)/../node_modules/react-native-keychain/RNKeychainManager",
16741641
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
1675-
"$(SRCROOT)/../node_modules/react-native-onesignal/**",
16761642
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
16771643
"$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**",
1678-
"$(SRCROOT)/../node_modules/react-native-onesignal/ios/**",
16791644
"$(SRCROOT)/../node_modules/react-native-safari-view",
16801645
"$(SRCROOT)/../node_modules/react-native-custom-tabs/ios/ReactNativeCustomTabs",
16811646
"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
@@ -1710,7 +1675,6 @@
17101675
buildSettings = {
17111676
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
17121677
CLANG_ENABLE_MODULES = YES;
1713-
CODE_SIGN_ENTITLEMENTS = "AllAboutOlaf/All About Olaf.entitlements";
17141678
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Hawken Rives (TMK6S7TPX2)";
17151679
CODE_SIGN_STYLE = Manual;
17161680
DEVELOPMENT_TEAM = TMK6S7TPX2;
@@ -1721,10 +1685,8 @@
17211685
"$(SRCROOT)/../node_modules/react-native/ReactCommon/**",
17221686
"$(SRCROOT)/../node_modules/react-native-keychain/RNKeychainManager",
17231687
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
1724-
"$(SRCROOT)/../node_modules/react-native-onesignal/**",
17251688
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
17261689
"$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**",
1727-
"$(SRCROOT)/../node_modules/react-native-onesignal/ios/**",
17281690
"$(SRCROOT)/../node_modules/react-native-safari-view",
17291691
"$(SRCROOT)/../node_modules/react-native-custom-tabs/ios/ReactNativeCustomTabs",
17301692
"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
@@ -1806,7 +1768,6 @@
18061768
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
18071769
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
18081770
"$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**",
1809-
"$(SRCROOT)/../node_modules/react-native-onesignal/ios/**",
18101771
"$(SRCROOT)/../node_modules/react-native-safari-view",
18111772
"$(SRCROOT)/../node_modules/react-native-custom-tabs/ios/ReactNativeCustomTabs",
18121773
);
@@ -1864,7 +1825,6 @@
18641825
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
18651826
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
18661827
"$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**",
1867-
"$(SRCROOT)/../node_modules/react-native-onesignal/ios/**",
18681828
"$(SRCROOT)/../node_modules/react-native-safari-view",
18691829
"$(SRCROOT)/../node_modules/react-native-custom-tabs/ios/ReactNativeCustomTabs",
18701830
);

‎ios/AllAboutOlaf/All About Olaf.entitlements‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎ios/AllAboutOlaf/AppDelegate.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@
88
*/
99

1010
#import <UIKit/UIKit.h>
11-
#import <RCTOneSignal.h>
1211

1312
@interface AppDelegate : UIResponder <UIApplicationDelegate>
1413

1514
@property (nonatomic, strong) UIWindow *window;
16-
@property (strong, nonatomic) RCTOneSignal* oneSignal;
1715

1816
@end

‎ios/AllAboutOlaf/AppDelegate.m‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,8 @@
1414
#import <React/RCTBundleURLProvider.h>
1515
#import <React/RCTRootView.h>
1616

17-
#import "RCTOneSignal.h"
18-
1917
@implementation AppDelegate
2018

21-
@synthesize oneSignal = _oneSignal;
22-
2319
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
2420
{
2521
NSURL *jsCodeLocation;
@@ -47,10 +43,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
4743

4844
rootView.loadingView = loadingViewController.view;
4945

50-
self.oneSignal = [[RCTOneSignal alloc] initWithLaunchOptions:launchOptions
51-
appId:@"aa46a500-ab1c-4127-b9ff-e7373da3ce35"
52-
settings:@{kOSSettingsKeyAutoPrompt: @false}];
53-
5446
// set up the requests cacher
5547
NSURLCache *URLCache = [[NSURLCache alloc] initWithMemoryCapacity:4 * 1024 * 1024 // 4 MiB
5648
diskCapacity:20 * 1024 * 1024 // 20 MiB
@@ -63,9 +55,4 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
6355
return YES;
6456
}
6557

66-
// Required for the notification event.
67-
- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)notification {
68-
[RCTOneSignal didReceiveRemoteNotification:notification];
69-
}
70-
7158
@end

‎ios/AllAboutOlaf/Info.plist‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
<key>UIBackgroundModes</key>
101101
<array>
102102
<string>audio</string>
103-
<string>remote-notification</string>
104103
</array>
105104
<key>UILaunchStoryboardName</key>
106105
<string>LaunchScreen</string>

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
"react-native-linear-gradient": "2.4.0",
8989
"react-native-maps": "0.19.0",
9090
"react-native-network-info": "3.0.0",
91-
"react-native-onesignal": "3.0.7",
9291
"react-native-restart": "0.0.6",
9392
"react-native-safari-view": "2.1.0",
9493
"react-native-search-bar": "3.3.1",

0 commit comments

Comments
 (0)