diff --git a/android/app/build.gradle b/android/app/build.gradle
index 269aa3ad..86724d3c 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -106,5 +106,4 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.1.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
-    implementation 'com.onesignal:OneSignal:[3.11.2, 3.99.99]'
-}
\ No newline at end of file
+}
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
old mode 100644
new mode 100755
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 86eb11d8..2210ceb1 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
diff --git a/lib/services/push_notifications/push_notifications.dart b/lib/services/push_notifications/push_notifications.dart
index 22b69fa9..de1af76d 100644
--- a/lib/services/push_notifications/push_notifications.dart
+++ b/lib/services/push_notifications/push_notifications.dart
@@ -86,7 +86,7 @@ class PushNotificationsService {
   Future subscribeToPushNotifications() async {
     bool permissionGranted = await this._getPermissionsState();
 
-    if (permissionGranted) {
+    if (!permissionGranted) {
       throw new Exception(
           'Tried to subscribe to push notifications without push notification permission');
     }
@@ -162,10 +162,10 @@ class PushNotificationsService {
   void _onSubscriptionChanged(OSSubscriptionStateChanges changes) {
     OSSubscriptionState toState = changes.to;
     OSSubscriptionState fromState = changes.from;
-    if (!fromState.subscribed && toState.subscribed) {
+    if (!fromState.isSubscribed && toState.isSubscribed) {
       // User just subscribed for notifications
       _onSubscribedToPushNotifications();
-    } else if (fromState.subscribed && !toState.subscribed) {
+    } else if (fromState.isSubscribed&& !toState.isSubscribed) {
       // User just unsubscribed for notifications
       _onUnsubscribedFromPushNotifications();
     }
diff --git a/pubspec.lock b/pubspec.lock
index 58779b0f..82c4b767 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -14,7 +14,7 @@ packages:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.1"
+    version: "1.7.2"
   archive:
     dependency: transitive
     description:
@@ -35,7 +35,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.8.1"
   back_button_interceptor:
     dependency: "direct main"
     description:
@@ -56,7 +56,21 @@ packages:
       name: cached_network_image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.1.0"
+  cached_network_image_platform_interface:
+    dependency: transitive
+    description:
+      name: cached_network_image_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
+  cached_network_image_web:
+    dependency: transitive
+    description:
+      name: cached_network_image_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
   characters:
     dependency: transitive
     description:
@@ -70,7 +84,7 @@ packages:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   cli_util:
     dependency: transitive
     description:
@@ -127,6 +141,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.0"
+  cross_file:
+    dependency: transitive
+    description:
+      name: cross_file
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.1+5"
   crypto:
     dependency: transitive
     description:
@@ -252,21 +273,21 @@ packages:
       name: flutter_colorpicker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.4"
+    version: "0.6.0"
   flutter_ffmpeg:
     dependency: "direct main"
     description:
       name: flutter_ffmpeg
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.0"
+    version: "0.4.2"
   flutter_image_compress:
     dependency: "direct main"
     description:
       name: flutter_image_compress
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   flutter_launcher_icons:
     dependency: "direct dev"
     description:
@@ -285,7 +306,7 @@ packages:
       name: flutter_markdown
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.2"
+    version: "0.6.6"
   flutter_pagewise:
     dependency: "direct main"
     description:
@@ -306,7 +327,7 @@ packages:
       name: flutter_secure_storage
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.2.0"
+    version: "4.2.1"
   flutter_slidable:
     dependency: "direct main"
     description:
@@ -379,28 +400,28 @@ packages:
       name: image_cropper
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.0"
+    version: "1.4.1"
   image_picker:
     dependency: "direct main"
     description:
       name: image_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.7.5+3"
+    version: "0.8.4+2"
   image_picker_for_web:
     dependency: transitive
     description:
       name: image_picker_for_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.3"
   image_picker_platform_interface:
     dependency: transitive
     description:
       name: image_picker_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.4.1"
   intercom_flutter:
     dependency: "direct main"
     description:
@@ -465,7 +486,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   mime:
     dependency: "direct main"
     description:
@@ -486,7 +507,7 @@ packages:
       name: onesignal_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.2.3"
   open_iconic_flutter:
     dependency: "direct main"
     description:
@@ -626,7 +647,7 @@ packages:
       name: photo_view
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.11.1"
+    version: "0.12.0"
   pigment:
     dependency: "direct main"
     description:
@@ -689,7 +710,7 @@ packages:
       name: rxdart
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.27.1"
+    version: "0.27.2"
   screen:
     dependency: "direct main"
     description:
@@ -759,7 +780,7 @@ packages:
       name: shared_preferences
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.6"
+    version: "2.0.8"
   shared_preferences_linux:
     dependency: transitive
     description:
@@ -813,7 +834,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   sprintf:
     dependency: "direct main"
     description:
@@ -883,7 +904,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19"
+    version: "0.4.2"
   throttling:
     dependency: "direct main"
     description:
@@ -897,7 +918,7 @@ packages:
       name: timeago
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.2"
+    version: "3.1.0"
   tinycolor:
     dependency: "direct main"
     description:
@@ -939,7 +960,7 @@ packages:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.4"
+    version: "6.0.12"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -1011,7 +1032,7 @@ packages:
       name: video_thumbnail
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.3"
+    version: "0.4.3"
   visibility_detector:
     dependency: "direct main"
     description:
@@ -1025,35 +1046,35 @@ packages:
       name: wakelock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.2"
+    version: "0.5.6"
   wakelock_macos:
     dependency: transitive
     description:
       name: wakelock_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.0+1"
+    version: "0.4.0"
   wakelock_platform_interface:
     dependency: transitive
     description:
       name: wakelock_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.1+1"
+    version: "0.3.0"
   wakelock_web:
     dependency: transitive
     description:
       name: wakelock_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0+1"
+    version: "0.4.0"
   wakelock_windows:
     dependency: transitive
     description:
       name: wakelock_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.0"
+    version: "0.2.0"
   watcher:
     dependency: transitive
     description:
@@ -1090,5 +1111,5 @@ packages:
     source: hosted
     version: "3.1.0"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
-  flutter: ">=2.0.0"
+  dart: ">=2.14.0 <3.0.0"
+  flutter: ">=2.5.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index d6a980f5..2a4c6c60 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -20,7 +20,7 @@ dependencies:
   html: ^0.15.0
   expandable: ^5.0.1
   uuid: ^3.0.4
-  flutter_image_compress: ^1.0.0
+  flutter_image_compress: ^1.1.0
   inview_notifier_list:
     git:
       url: https://github.com/OkunaOrg/inview_notifier_list.git
@@ -28,52 +28,52 @@ dependencies:
   connectivity: ^3.0.6
   visibility_detector: ^0.2.0
   http_retry: ^0.2.0
-  video_thumbnail: ^0.3.3
-  flutter_ffmpeg: ^0.4.0
+  video_thumbnail: ^0.4.3
+  flutter_ffmpeg: ^0.4.2
   open_iconic_flutter: ^0.3.0
   retry: ^3.1.0
-  shared_preferences: ^2.0.6
-  flutter_markdown: ^0.6.2
+  shared_preferences: ^2.0.8
+  flutter_markdown: ^0.6.6
   file_picker: ^3.0.2+2
   sentry_flutter: ^5.0.0
   screen: ^0.0.5
   back_button_interceptor: ^5.0.0
-  flutter_colorpicker: any
+  flutter_colorpicker: ^0.6.0
   intercom_flutter: ^3.2.1
   device_info: ^2.0.2
   flutter_pagewise: ^2.0.1
-  tinycolor: ^1.0.2
-  onesignal_flutter: ^3.0.0
+  tinycolor: ^1.0.3
+  onesignal_flutter: ^3.2.3
   flutter_advanced_networkimage:
     git:
       url: https://github.com/jozsefsallai/flutter_advanced_networkimage.git
       ref: 0b2c9775f8ab375c47f812a459f276b9feb107b8
   dcache: ^0.4.0
   validators: ^3.0.0
-  url_launcher: ^6.0.4
+  url_launcher: ^6.0.12
   uni_links: ^0.5.1
   flutter_slidable: "^0.6.0"
   flutter_cache_manager: ^3.1.0
-  cached_network_image: ^3.0.0
-  timeago: ^3.0.2
+  cached_network_image: ^3.1.0
+  timeago: ^3.1.0
   public_suffix: ^3.0.0
   pigment: ^1.0.4
-  photo_view: ^0.11.1
+  photo_view: ^0.12.0
   flutter_svg: ^0.22.0
-  flutter_secure_storage: ^4.2.0
+  flutter_secure_storage: ^4.2.1
   mime: ^1.0.0
   http: ^0.13.3
   throttling: ^1.0.0
-  wakelock: ^0.5.2
-  rxdart: ^0.27.1
+  wakelock: ^0.5.6
+  rxdart: ^0.27.2
   video_player:
     git:
       url: https://github.com/jozsefsallai/flutter-plugins.git
       ref: nullsafety
       path: packages/video_player
   sprintf: "^6.0.0"
-  image_picker: ^0.7.5+3
-  image_cropper: ^1.4.0
+  image_picker: ^0.8.4+2
+  image_cropper: ^1.4.1
   shimmer: ^2.0.0
   share_plus: ^2.1.4
   path: ^1.8.0