rm redundant answered check and misc cleanup

Author: jkasten2

OneSignalSDK/onesignal/src/main/java/com/onesignal/AlertDialogPrepromptForAndroidSettings.kt

@@ -33,4 +33,4 @@ object AlertDialogPrepromptForAndroidSettings {
             }
             .show()
     }
-}
+}

OneSignalSDK/onesignal/src/main/java/com/onesignal/GMSLocationController.java

@@ -124,8 +124,6 @@ private static class GoogleApiClientListener implements GoogleApiClient.Connecti
         @Override
         public void onConnected(Bundle bundle) {
             synchronized (syncLock) {
-                PermissionsActivity.answered = false;
-
                 if (googleApiClient == null || googleApiClient.realInstance() == null) {
                     OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "GMSLocationController GoogleApiClientListener onConnected googleApiClient not available, returning");
                     return;

OneSignalSDK/onesignal/src/main/java/com/onesignal/LocationController.java

@@ -343,8 +343,6 @@ static boolean isHMSAvailable() {
    }
 
    static void fireFailedComplete() {
-      PermissionsActivity.answered = false;
-
       synchronized (syncLock) {
          if (isGooglePlayServicesAvailable())
             GMSLocationController.fireFailedComplete();
@@ -413,4 +411,4 @@ protected static class LocationHandlerThread extends HandlerThread {
          mHandler = new Handler(getLooper());
       }
    }
-}
+}

OneSignalSDK/onesignal/src/main/java/com/onesignal/NavigateToAndroidSettingsForLocation.kt

@@ -11,4 +11,4 @@ object NavigateToAndroidSettingsForLocation {
         intent.data = Uri.parse("package:" + context.packageName)
         context.startActivity(intent)
     }
-}
+}

OneSignalSDK/onesignal/src/main/java/com/onesignal/PermissionsActivity.java

@@ -33,6 +33,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+
 import androidx.annotation.NonNull;
 
 import com.onesignal.AndroidSupportV4Compat.ActivityCompat;
@@ -53,7 +54,7 @@ interface PermissionCallback {
    private static final int ONESIGNAL_PERMISSION_REQUEST_CODE = 2;
    private static final int REQUEST_SETTINGS = 3;
 
-   static boolean waiting, answered, fallbackToSettings, neverAskAgainClicked;
+   private static boolean waiting, fallbackToSettings, neverAskAgainClicked;
    private static ActivityLifecycleHandler.ActivityAvailableListener activityAvailableListener;
 
    private static final String INTENT_EXTRA_PERMISSION_TYPE = "INTENT_EXTRA_PERMISSION_TYPE";
@@ -79,26 +80,12 @@ protected void onCreate(Bundle savedInstanceState) {
       OneSignal.initWithContext(this);
 
       handleBundleParams(getIntent().getExtras());
-
-// TODO: Very unlikely we need to handle this special case, but come back and confirm
-//      // Android sets android:hasCurrentPermissionsRequest if the Activity was recreated while
-//      //  the permission prompt is showing to the user.
-//      // This can happen if the task is cold resumed from the Recent Apps list.
-//      if (savedInstanceState != null &&
-//          savedInstanceState.getBoolean("android:hasCurrentPermissionsRequest", false))
-//         waiting = true;
-//      else
-//         requestPermission();
    }
 
    @Override
    protected void onNewIntent(Intent intent) {
       super.onNewIntent(intent);
       handleBundleParams(intent.getExtras());
-
-// TODO: Confirm if we still need this check
-//      if (OneSignal.isInitDone())
-//         requestPermission();
    }
 
    private void handleBundleParams(Bundle extras) {
@@ -140,7 +127,6 @@ private void requestPermission(String androidPermissionString) {
 
    @Override
    public void onRequestPermissionsResult(final int requestCode, @NonNull String permissions[], @NonNull final int[] grantResults) {
-      answered = true;
       waiting = false;
 
       // TODO improve this method
@@ -187,7 +173,7 @@ static void startPrompt(
       String androidPermissionString,
       Class<?> callbackClass
    ) {
-      if (PermissionsActivity.waiting || PermissionsActivity.answered)
+      if (PermissionsActivity.waiting)
          return;
 
       fallbackToSettings = fallbackCondition;