Reviewed generated code based on latest unpublished version of JNetReflector

.github/workflows/generateclasses.yaml

@@ -12,6 +12,11 @@ on:
         required: true
         default: false
         type: boolean
+      UseLatestJNetReflector:
+        description: 'Shall use latest unpublished version of JNetReflector'
+        required: true
+        default: false
+        type: boolean
 
 # This workflow contains one job called "build_documentation"
 jobs:
@@ -31,10 +36,16 @@ jobs:
 
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4
+        if: ${{ inputs.UseLatestJNetReflector == true }}
         with:
           fetch-depth: '1'
           submodules: 'true'
 
+      - uses: actions/checkout@v4
+        if: ${{ inputs.UseLatestJNetReflector == false }}
+        with:
+          fetch-depth: '1'
+
       - name: Pre compile
         run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" src\net\Netdroid\Netdroid.csproj
         env:
@@ -65,7 +76,20 @@ jobs:
       - name: Clear Java generated files
         run: Remove-Item .\src\jvm\netdroid\src\main\java\org\mases\netdroid\generated\* -Recurse -Force -Exclude README.md
 
-      - run: dotnet tool update --version 2.5.1 -g MASES.JNetReflector
+      - name: Prebuild
+        run: dotnet build --no-incremental --configuration Release 3rdparty\JNet\src\net\JNetReflector\JNetReflector.csproj
+
+      - name: Create Jars of JNetReflector
+        if: ${{ inputs.UseLatestJNetReflector == true }}
+        run: mvn "-Djcobridgepath=../../../binReflector/net8.0/JCOBridge.jar" --file ./3rdparty/JNet/src/jvm/jnet/pom.xml --no-transfer-progress package
+        env:
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+
+      - name: Download latest published version of JNetReflector
+        run: dotnet tool update --version 2.5.1 -g MASES.JNetReflector
+        if: ${{ inputs.UseLatestJNetReflector == false }}
 
       - name: Set up Apache Maven Central
         uses: actions/setup-java@v4
@@ -79,9 +103,19 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
-      - name: Build classes
+      - name: Build classes with unpublished JNetReflector
+        if: ${{ inputs.UseLatestJNetReflector == true }}
+        shell: cmd
+        run: |
+          cd 3rdparty\JNet\binReflector\net8.0
+          MASES.JNetReflector.exe -TraceLevel 0 -OriginRootPath %ANDROID_HOME%\platforms\android-34-ext8 -DestinationRootPath %GITHUB_WORKSPACE%\src\ -ConfigurationFile %GITHUB_WORKSPACE%\src\configuration.json
+        env:
+          JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+
+      - name: Build classes with latest published version of JNetReflector
+        if: ${{ inputs.UseLatestJNetReflector == false }}
         shell: cmd
-        run: jnetreflector -TraceLevel 0 -OriginRootPath %ANDROID_HOME%\platforms\android-34-ext8 -DestinationRootPath .\src\ -ConfigurationFile .\src\configuration.json
+        run: jnetreflector -TraceLevel 0 -OriginRootPath %ANDROID_HOME%\platforms\android-34-ext8 -DestinationRootPath %GITHUB_WORKSPACE%\src\ -ConfigurationFile %GITHUB_WORKSPACE%\src\configuration.json
         env:
           JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
 

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "3rdparty/JNet"]
+	path = 3rdparty/JNet
+	url = https://github.com/masesgroup/JNet

README.md

@@ -1,8 +1,3 @@
----
-title: Android suite for .NET
-_description: Main page of Android suite for .NET
----
-
 # Netdroid: Android suite for .NET
 
 Netdroid is a comprehensive suite of libraries and tools to use Android and .NET side-by-side.

src/configuration.json

@@ -4,7 +4,7 @@
   "JavaListenerBasePackage": "org.mases.netdroid.generated",
   "ReflectDeprecated": true,
   "PreferMethodWithSignature": true,
-  "OnlyPropertiesForGetterSetter": true,
+  "DisablePropertiesForGetterSetter": true,
   "DisableInterfaceMethodGeneration": true,
   "CreateInterfaceInheritance": true,
   "JarList": [
@@ -13,7 +13,8 @@
   "OriginJavadocJARVersionAndUrls": [
     {
       "Version": 11,
-      "Url": "https://developer.android.com/reference/"
+      "Url": "https://developer.android.com/reference/",
+      "NoModule": true
     }
   ],
   "NamespacesToAvoid": [
@@ -30,10 +31,12 @@
     "org.slf4j"
   ],
   "ClassesToBeListener": [
+    "android.hardware.SensorEventListener2",
+    "android.media.MediaScannerConnection$MediaScannerConnectionClient",
     "javax.swing.Action",
     "javax.management.NotificationFilter"
   ],
-  "ClassesToAvoidJavaListener": [
+  "ClassesToRemoveAsListener": [
     "android.animation.AnimatorListenerAdapter",
     "android.bluetooth.BluetoothAdapter",
     "android.content.AbstractThreadedSyncAdapter",
@@ -59,6 +62,7 @@
     "android.text.method.MetaKeyKeyListener",
     "android.text.method.QwertyKeyListener",
     "android.text.method.TimeKeyListener",
+    "android.widget.ArrayAdapter",
     "android.widget.CursorTreeAdapter",
     "android.widget.HeaderViewListAdapter",
     "android.widget.ResourceCursorAdapter",
@@ -71,20 +75,16 @@
     "org.xml.sax.helpers.XMLReaderAdapter"
   ],
   "ClassesToAvoid": [
-    "android.R",
-    "android.icu.number.NumberFormatterSettings",
-    "android.icu.number.NumberRangeFormatterSettings",
-    "android.icu.text.UnicodeSetIterator",
-    "android.text.style.TtsSpan",
     "android.util.Range",
-    "android.util.TypedValue",
-    "android.widget.ArrayAdapter",
     "java.io.ObjectInputFilter",
     "java.lang.Enum$EnumDesc",
     "java.lang.Module",
     "java.lang.ModuleLayer",
     "java.lang.ProcessBuilder$Redirect$Type",
     "java.lang.ProcessHandle",
+    "java.lang.ProcessHandle$Info",
+    "java.lang.Runtime$Version",
+    "java.lang.System$Logger",
     "java.lang.Thread$UncaughtExceptionHandler",
     "java.lang.reflect.AnnotatedType",
     "java.security.SecureRandomParameters",
@@ -105,34 +105,10 @@
     "java.util.ServiceLoader$Provider",
     "java.util.zip.ZipConstants",
     "javax.sql.PooledConnectionBuilder",
-    "javax.swing.ToolTipManager",
-    "javax.swing.text.html.HTMLEditorKit$LinkController",
-    "javax.swing.plaf.basic.BasicButtonListener",
-    "javax.swing.plaf.basic.BasicTreeUI$MouseHandler",
-    "javax.swing.plaf.basic.BasicDesktopIconUI$MouseInputHandler",
-    "javax.swing.plaf.basic.BasicTabbedPaneUI$FocusHandler",
-    "javax.swing.plaf.basic.BasicComboBoxUI$KeyHandler",
-    "javax.swing.plaf.basic.BasicSliderUI$ComponentHandler",
-    "javax.swing.plaf.basic.BasicComboPopup$InvocationKeyHandler",
-    "javax.swing.plaf.basic.BasicTreeUI$KeyHandler",
-    "javax.swing.plaf.basic.BasicTreeUI$ComponentHandler",
-    "javax.swing.plaf.basic.BasicSplitPaneUI$FocusHandler",
-    "javax.swing.plaf.basic.BasicTabbedPaneUI$MouseHandler",
-    "javax.swing.plaf.basic.BasicOptionPaneUI$ButtonActionListener",
-    "javax.swing.plaf.basic.BasicToolBarUI$DockingListener",
-    "javax.swing.plaf.basic.BasicScrollPaneUI$HSBChangeListener",
-    "javax.swing.plaf.basic.BasicInternalFrameUI$InternalFramePropertyChangeListener",
-    "javax.swing.plaf.basic.BasicSliderUI$ScrollListener",
-    "javax.swing.plaf.basic.BasicSliderUI$TrackListener",
-    "javax.swing.plaf.basic.BasicScrollPaneUI$VSBChangeListener",
-    "javax.swing.plaf.metal.MetalComboBoxUI$MetalPropertyChangeListener",
-    "javax.tools.DiagnosticListener",
     "javax.xml.xpath.XPathEvaluationResult",
     "org.w3c.dom.ls.LSSerializerFilter"
   ],
   "NamespacesInConflict": [
-    "android.system",
-    "dalvik.system",
     "java.lang.module",
     "java.awt.color",
     "java.awt.desktop",

src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/accessibilityservice/OnMagnificationChangedListener.java → src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/accessibilityservice/AccessibilityService_MagnificationController_OnMagnificationChangedListener.java

@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.accessibilityservice;
 
-public final class OnMagnificationChangedListener extends org.mases.jcobridge.JCListener implements android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener {
-    public OnMagnificationChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AccessibilityService_MagnificationController_OnMagnificationChangedListener extends org.mases.jcobridge.JCListener implements android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener {
+    public AccessibilityService_MagnificationController_OnMagnificationChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 

src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/accessibilityservice/OnShowModeChangedListener.java → src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/accessibilityservice/AccessibilityService_SoftKeyboardController_OnShowModeChangedListener.java

@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.accessibilityservice;
 
-public final class OnShowModeChangedListener extends org.mases.jcobridge.JCListener implements android.accessibilityservice.AccessibilityService.SoftKeyboardController.OnShowModeChangedListener {
-    public OnShowModeChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AccessibilityService_SoftKeyboardController_OnShowModeChangedListener extends org.mases.jcobridge.JCListener implements android.accessibilityservice.AccessibilityService.SoftKeyboardController.OnShowModeChangedListener {
+    public AccessibilityService_SoftKeyboardController_OnShowModeChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 

src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/AnimatorListener.java → src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/Animator_AnimatorListener.java

@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.animation;
 
-public final class AnimatorListener extends org.mases.jcobridge.JCListener implements android.animation.Animator.AnimatorListener {
-    public AnimatorListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Animator_AnimatorListener extends org.mases.jcobridge.JCListener implements android.animation.Animator.AnimatorListener {
+    public Animator_AnimatorListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 

src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/AnimatorPauseListener.java → src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/Animator_AnimatorPauseListener.java

@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.animation;
 
-public final class AnimatorPauseListener extends org.mases.jcobridge.JCListener implements android.animation.Animator.AnimatorPauseListener {
-    public AnimatorPauseListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Animator_AnimatorPauseListener extends org.mases.jcobridge.JCListener implements android.animation.Animator.AnimatorPauseListener {
+    public Animator_AnimatorPauseListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 

src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/TransitionListener.java → src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/LayoutTransition_TransitionListener.java

@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.animation;
 
-public final class TransitionListener extends org.mases.jcobridge.JCListener implements android.animation.LayoutTransition.TransitionListener {
-    public TransitionListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class LayoutTransition_TransitionListener extends org.mases.jcobridge.JCListener implements android.animation.LayoutTransition.TransitionListener {
+    public LayoutTransition_TransitionListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 

src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/TimeListener.java → src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/TimeAnimator_TimeListener.java

@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.animation;
 
-public final class TimeListener extends org.mases.jcobridge.JCListener implements android.animation.TimeAnimator.TimeListener {
-    public TimeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TimeAnimator_TimeListener extends org.mases.jcobridge.JCListener implements android.animation.TimeAnimator.TimeListener {
+    public TimeAnimator_TimeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 

src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/AnimatorUpdateListener.java → src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/ValueAnimator_AnimatorUpdateListener.java

@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.animation;
 
-public final class AnimatorUpdateListener extends org.mases.jcobridge.JCListener implements android.animation.ValueAnimator.AnimatorUpdateListener {
-    public AnimatorUpdateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ValueAnimator_AnimatorUpdateListener extends org.mases.jcobridge.JCListener implements android.animation.ValueAnimator.AnimatorUpdateListener {
+    public ValueAnimator_AnimatorUpdateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 

src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/DurationScaleChangeListener.java → src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/ValueAnimator_DurationScaleChangeListener.java

@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.animation;
 
-public final class DurationScaleChangeListener extends org.mases.jcobridge.JCListener implements android.animation.ValueAnimator.DurationScaleChangeListener {
-    public DurationScaleChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ValueAnimator_DurationScaleChangeListener extends org.mases.jcobridge.JCListener implements android.animation.ValueAnimator.DurationScaleChangeListener {
+    public ValueAnimator_DurationScaleChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 

src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnMenuVisibilityListener.java → src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/ActionBar_OnMenuVisibilityListener.java

@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnMenuVisibilityListener extends org.mases.jcobridge.JCListener implements android.app.ActionBar.OnMenuVisibilityListener {
-    public OnMenuVisibilityListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ActionBar_OnMenuVisibilityListener extends org.mases.jcobridge.JCListener implements android.app.ActionBar.OnMenuVisibilityListener {
+    public ActionBar_OnMenuVisibilityListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 

src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnNavigationListener.java → src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/ActionBar_OnNavigationListener.java

@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnNavigationListener extends org.mases.jcobridge.JCListener implements android.app.ActionBar.OnNavigationListener {
-    public OnNavigationListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ActionBar_OnNavigationListener extends org.mases.jcobridge.JCListener implements android.app.ActionBar.OnNavigationListener {
+    public ActionBar_OnNavigationListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 

src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/TabListener.java → src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/ActionBar_TabListener.java

@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class TabListener extends org.mases.jcobridge.JCListener implements android.app.ActionBar.TabListener {
-    public TabListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ActionBar_TabListener extends org.mases.jcobridge.JCListener implements android.app.ActionBar.TabListener {
+    public ActionBar_TabListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 

src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnAlarmListener.java → src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/AlarmManager_OnAlarmListener.java

@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnAlarmListener extends org.mases.jcobridge.JCListener implements android.app.AlarmManager.OnAlarmListener {
-    public OnAlarmListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AlarmManager_OnAlarmListener extends org.mases.jcobridge.JCListener implements android.app.AlarmManager.OnAlarmListener {
+    public AlarmManager_OnAlarmListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 

src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnOpActiveChangedListener.java → src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/AppOpsManager_OnOpActiveChangedListener.java

@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnOpActiveChangedListener extends org.mases.jcobridge.JCListener implements android.app.AppOpsManager.OnOpActiveChangedListener {
-    public OnOpActiveChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AppOpsManager_OnOpActiveChangedListener extends org.mases.jcobridge.JCListener implements android.app.AppOpsManager.OnOpActiveChangedListener {
+    public AppOpsManager_OnOpActiveChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 

src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnOpChangedListener.java → src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/AppOpsManager_OnOpChangedListener.java

@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnOpChangedListener extends org.mases.jcobridge.JCListener implements android.app.AppOpsManager.OnOpChangedListener {
-    public OnOpChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AppOpsManager_OnOpChangedListener extends org.mases.jcobridge.JCListener implements android.app.AppOpsManager.OnOpChangedListener {
+    public AppOpsManager_OnOpChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 

src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnProvideAssistDataListener.java → src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/Application_OnProvideAssistDataListener.java

@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnProvideAssistDataListener extends org.mases.jcobridge.JCListener implements android.app.Application.OnProvideAssistDataListener {
-    public OnProvideAssistDataListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Application_OnProvideAssistDataListener extends org.mases.jcobridge.JCListener implements android.app.Application.OnProvideAssistDataListener {
+    public Application_OnProvideAssistDataListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 

src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnDateSetListener.java → src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/DatePickerDialog_OnDateSetListener.java

@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnDateSetListener extends org.mases.jcobridge.JCListener implements android.app.DatePickerDialog.OnDateSetListener {
-    public OnDateSetListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class DatePickerDialog_OnDateSetListener extends org.mases.jcobridge.JCListener implements android.app.DatePickerDialog.OnDateSetListener {
+    public DatePickerDialog_OnDateSetListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 

src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnBreadCrumbClickListener.java → src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/FragmentBreadCrumbs_OnBreadCrumbClickListener.java

@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnBreadCrumbClickListener extends org.mases.jcobridge.JCListener implements android.app.FragmentBreadCrumbs.OnBreadCrumbClickListener {
-    public OnBreadCrumbClickListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class FragmentBreadCrumbs_OnBreadCrumbClickListener extends org.mases.jcobridge.JCListener implements android.app.FragmentBreadCrumbs.OnBreadCrumbClickListener {
+    public FragmentBreadCrumbs_OnBreadCrumbClickListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 

src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnBackStackChangedListener.java → src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/FragmentManager_OnBackStackChangedListener.java

@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnBackStackChangedListener extends org.mases.jcobridge.JCListener implements android.app.FragmentManager.OnBackStackChangedListener {
-    public OnBackStackChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class FragmentManager_OnBackStackChangedListener extends org.mases.jcobridge.JCListener implements android.app.FragmentManager.OnBackStackChangedListener {
+    public FragmentManager_OnBackStackChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 

src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/KeyguardLockedStateListener.java → src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/KeyguardManager_KeyguardLockedStateListener.java

@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class KeyguardLockedStateListener extends org.mases.jcobridge.JCListener implements android.app.KeyguardManager.KeyguardLockedStateListener {
-    public KeyguardLockedStateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class KeyguardManager_KeyguardLockedStateListener extends org.mases.jcobridge.JCListener implements android.app.KeyguardManager.KeyguardLockedStateListener {
+    public KeyguardManager_KeyguardLockedStateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }