diff --git a/bin/cloudbrowser/android/src/org/videolan/cloudbrowser/CloudBrowser.java b/bin/cloudbrowser/android/src/org/videolan/cloudbrowser/CloudBrowser.java
index 23aa275354f3753b91e42ccf535e46cdf9149171..16ec42d446020d9bfab733b046b63100bd2ec3fc 100644
--- a/bin/cloudbrowser/android/src/org/videolan/cloudbrowser/CloudBrowser.java
+++ b/bin/cloudbrowser/android/src/org/videolan/cloudbrowser/CloudBrowser.java
@@ -26,8 +26,6 @@ public class CloudBrowser extends QtActivity {
     private RelativeLayout m_ad_view;
     private boolean m_ad_view_visible = false;
 
-    private native void onRequestResult(int request, int result, Intent data);
-
     private void updateAdView() {
         if (m_ad_view != null && m_view_group != null)
             m_view_group.removeView(m_ad_view);
@@ -57,14 +55,14 @@ public class CloudBrowser extends QtActivity {
             public void onAdLoaded() {
                 runOnUiThread(new Runnable() {
                     public void run() {
-                        NotificationHelper.callback("SHOW_AD");
+                        Utility.onActionRequested("SHOW_AD");
                         attach();
                     }
                 });
             }
 
             public void onAdFailedToLoad(int error) {
-                NotificationHelper.callback("HIDE_AD");
+                Utility.onActionRequested("HIDE_AD");
             }
         });
         ad.loadAd(new AdRequest.Builder().build());
@@ -93,7 +91,7 @@ public class CloudBrowser extends QtActivity {
     @Override
     public void onActivityResult(int request, int result, Intent data) {
         super.onActivityResult(request, result, data);
-        onRequestResult(request, result, data);
+        Utility.onRequestResult(request, result, data);
     }
 
     @Override
diff --git a/bin/cloudbrowser/android/src/org/videolan/cloudbrowser/NotificationHelper.java b/bin/cloudbrowser/android/src/org/videolan/cloudbrowser/NotificationHelper.java
index 2501fd2dff2be237c6c3cb1c5dc74bc6fffe8600..4b2f37ef04d01a340b49616465b3656a30093cad 100644
--- a/bin/cloudbrowser/android/src/org/videolan/cloudbrowser/NotificationHelper.java
+++ b/bin/cloudbrowser/android/src/org/videolan/cloudbrowser/NotificationHelper.java
@@ -22,12 +22,10 @@ public class NotificationHelper {
 
     private static class Receiver extends BroadcastReceiver {
         public void onReceive(Context ctx, Intent intent) {
-            callback(intent.getAction());
+            Utility.onActionRequested(intent.getAction());
         }
     }
 
-    public static native void callback(String action);
-
     public NotificationHelper(Context context) {
         m_context = context;
         m_notification_manager =
diff --git a/bin/cloudbrowser/android/src/org/videolan/cloudbrowser/Utility.java b/bin/cloudbrowser/android/src/org/videolan/cloudbrowser/Utility.java
index 6e76be29d720c7af9b9328795c299d6b7e8bcb2e..f91ba8db7fc54f3c4f5ead1a9477a8f81b151145 100644
--- a/bin/cloudbrowser/android/src/org/videolan/cloudbrowser/Utility.java
+++ b/bin/cloudbrowser/android/src/org/videolan/cloudbrowser/Utility.java
@@ -4,6 +4,9 @@ import android.net.Uri;
 import android.content.Intent;
 
 public class Utility {
+    public static native void onActionRequested(String action);
+    public static native void onRequestResult(int request, int result, Intent data);
+
     public static Uri stringToUri(String uri) {
         String basename = uri.substring(0, uri.lastIndexOf('/') + 1);
         String filename = uri.substring(uri.lastIndexOf('/') + 1);
diff --git a/bin/cloudbrowser/src/AndroidUtility.cpp b/bin/cloudbrowser/src/AndroidUtility.cpp
index c6bd89772863624db2d056ed3d522c80ccbbaebf..8bd640e00ac7d11825ae8fe66326f041977d8c38 100644
--- a/bin/cloudbrowser/src/AndroidUtility.cpp
+++ b/bin/cloudbrowser/src/AndroidUtility.cpp
@@ -24,20 +24,15 @@ std::unordered_map<int, std::unordered_set<AndroidUtility::IResultListener *>>
 }  // namespace
 
 extern "C" {
-JNIEXPORT void JNICALL
-Java_org_videolan_cloudbrowser_NotificationHelper_callback(JNIEnv *env,
-                                                           jclass *,
-                                                           jstring action) {
+JNIEXPORT void JNICALL Java_org_videolan_cloudbrowser_Utility_onActionRequested(
+    JNIEnv *env, jclass *, jstring action) {
   const char *str = env->GetStringUTFChars(action, nullptr);
   emit android->notify(str);
   env->ReleaseStringUTFChars(action, str);
 }
 
-JNIEXPORT void JNICALL
-Java_org_videolan_cloudbrowser_CloudBrowser_onRequestResult(JNIEnv *, jobject *,
-                                                            jint request,
-                                                            jint result,
-                                                            jobject data) {
+JNIEXPORT void JNICALL Java_org_videolan_cloudbrowser_Utility_onRequestResult(
+    JNIEnv *, jclass *, jint request, jint result, jobject data) {
   std::unique_lock<std::mutex> lock(mutex);
   auto cb = result_listener.find(request);
   if (cb != result_listener.end()) {
diff --git a/bin/cloudbrowser/src/FileDialog.h b/bin/cloudbrowser/src/FileDialog.h
index 2d23fac75de8cfd63c59ab36a4722705dd28db02..e65bed46b33999b3cf5c1c13d1337379a8733b03 100644
--- a/bin/cloudbrowser/src/FileDialog.h
+++ b/bin/cloudbrowser/src/FileDialog.h
@@ -57,7 +57,7 @@ class FileDialog : public IFileDialog {
    public:
     ActivityReceiver(FileDialog*);
     void done(int request_code, int result_code,
-                              const QAndroidJniObject& data) override;
+              const QAndroidJniObject& data) override;
 
    private:
     FileDialog* file_dialog_;