From 1da7acd93d9eacd253807202cfd59d01948919cf Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Fri, 30 Sep 2022 16:42:42 +0300
Subject: [PATCH] Android: remove overrides for uneccessary and deprecated
 methods
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Those overrides are deprecated and will print a warning during Gradle
build, moreover, these calls don't have any implementation by Qt that's
being triggered by the Qt Delegates classes, so they don't need to be
kept in the Activity/Service main classes' implementations.

Task-number: QTBUG-115014
Task-number: QTBUG-114593
Change-Id: If0c241206652c1a52e2396a24ec7ab63236e6308
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
---
 .../qt/android/bindings/QtActivity.java       | 83 -------------------
 1 file changed, 83 deletions(-)

diff --git a/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
index 63884dc6748..073a104e89a 100644
--- a/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
+++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
@@ -6,7 +6,6 @@ package org.qtproject.qt.android.bindings;
 
 import android.app.Activity;
 import android.app.Dialog;
-import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -300,21 +299,6 @@ public class QtActivity extends Activity
     }
     //---------------------------------------------------------------------------
 
-    @Override
-    protected Dialog onCreateDialog(int id)
-    {
-        QtLoader.InvokeResult res = QtLoader.invokeDelegate(id);
-        if (res.invoked)
-            return (Dialog)res.methodReturns;
-        else
-            return super.onCreateDialog(id);
-    }
-    public Dialog super_onCreateDialog(int id)
-    {
-        return super.onCreateDialog(id);
-    }
-    //---------------------------------------------------------------------------
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu)
     {
@@ -359,21 +343,7 @@ public class QtActivity extends Activity
     {
         return super.onCreatePanelView(featureId);
     }
-    //---------------------------------------------------------------------------
 
-    @Override
-    public boolean onCreateThumbnail(Bitmap outBitmap, Canvas canvas)
-    {
-        QtApplication.InvokeResult res = QtApplication.invokeDelegate(outBitmap, canvas);
-        if (res.invoked)
-            return (Boolean)res.methodReturns;
-        else
-            return super.onCreateThumbnail(outBitmap, canvas);
-    }
-    public boolean super_onCreateThumbnail(Bitmap outBitmap, Canvas canvas)
-    {
-        return super.onCreateThumbnail(outBitmap, canvas);
-    }
     //---------------------------------------------------------------------------
 
     @Override
@@ -557,18 +527,6 @@ public class QtActivity extends Activity
     }
     //---------------------------------------------------------------------------
 
-    @Override
-    protected void onPrepareDialog(int id, Dialog dialog)
-    {
-        if (!QtLoader.invokeDelegate(id, dialog).invoked)
-            super.onPrepareDialog(id, dialog);
-    }
-    public void super_onPrepareDialog(int id, Dialog dialog)
-    {
-        super.onPrepareDialog(id, dialog);
-    }
-    //---------------------------------------------------------------------------
-
     @Override
     public boolean onPrepareOptionsMenu(Menu menu)
     {
@@ -827,35 +785,6 @@ public class QtActivity extends Activity
     //---------------------------------------------------------------------------
 //@ANDROID-5
 
-//////////////// Activity API 8 /////////////
-//@ANDROID-8
-@Override
-    protected Dialog onCreateDialog(int id, Bundle args)
-    {
-        QtLoader.InvokeResult res = QtLoader.invokeDelegate(id, args);
-        if (res.invoked)
-            return (Dialog)res.methodReturns;
-        else
-            return super.onCreateDialog(id, args);
-    }
-    public Dialog super_onCreateDialog(int id, Bundle args)
-    {
-        return super.onCreateDialog(id, args);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onPrepareDialog(int id, Dialog dialog, Bundle args)
-    {
-        if (!QtLoader.invokeDelegate(id, dialog, args).invoked)
-            super.onPrepareDialog(id, dialog, args);
-    }
-    public void super_onPrepareDialog(int id, Dialog dialog, Bundle args)
-    {
-        super.onPrepareDialog(id, dialog, args);
-    }
-    //---------------------------------------------------------------------------
-//@ANDROID-8
     //////////////// Activity API 11 /////////////
 
 //@ANDROID-11
@@ -897,18 +826,6 @@ public class QtActivity extends Activity
     }
     //---------------------------------------------------------------------------
 
-    @Override
-    public void onAttachFragment(Fragment fragment)
-    {
-        if (!QtLoader.invokeDelegate(fragment).invoked)
-            super.onAttachFragment(fragment);
-    }
-    public void super_onAttachFragment(Fragment fragment)
-    {
-        super.onAttachFragment(fragment);
-    }
-    //---------------------------------------------------------------------------
-
     @Override
     public View onCreateView(View parent, String name, Context context, AttributeSet attrs)
     {