Revert "Merge pull request #819 from urbanairship/MOBILE-1541"

This reverts commit 881d58f, reversing
changes made to b97b3c1.

urbanairship-core/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.urbanairship"
     android:versionCode="1"
@@ -9,11 +8,13 @@
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <application>
+
         <activity
             android:name="com.urbanairship.push.NotificationProxyActivity"
-            android:exported="false"
             android:taskAffinity="com.urbanairship.push.NotificationProxyActivity"
+            android:exported="false"
             android:theme="@android:style/Theme.NoDisplay" />
+
         <activity
             android:name="com.urbanairship.util.HelperActivity"
             android:exported="false"
@@ -22,6 +23,7 @@
                 android:name="com.urbanairship.push.iam.EXCLUDE_FROM_AUTO_SHOW"
                 android:value="true" />
         </activity>
+
         <activity
             android:name="com.urbanairship.google.PlayServicesErrorActivity"
             android:exported="false"
@@ -30,26 +32,25 @@
                 android:name="com.urbanairship.push.iam.EXCLUDE_FROM_AUTO_SHOW"
                 android:value="true" />
         </activity>
+
         <activity
             android:name="com.urbanairship.actions.RateAppActivity"
             android:exported="false"
             android:theme="@style/UrbanAirship.RateAppActivity">
+
             <meta-data
                 android:name="com.urbanairship.push.iam.EXCLUDE_FROM_AUTO_SHOW"
                 android:value="true" />
+
             <intent-filter>
                 <action android:name="com.urbanairship.actions.SHOW_RATE_APP_INTENT_ACTION" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
-        <activity
-            android:name="com.urbanairship.actions.WalletLoadingActivity"
-            android:noHistory="true"
-            android:exported="false">
-        </activity>
+
 
         <service android:name="com.urbanairship.job.AirshipService" />
+
         <service
             android:name="com.urbanairship.job.AndroidJobService"
             android:permission="android.permission.BIND_JOB_SERVICE" />
@@ -62,6 +63,7 @@
                 <category android:name="${applicationId}" />
             </intent-filter>
         </receiver>
+
         <receiver
             android:name="com.urbanairship.locale.LocaleChangeReceiver"
             android:exported="false">
@@ -74,5 +76,6 @@
             android:name="com.urbanairship.UrbanAirshipProvider"
             android:authorities="${applicationId}.urbanairship.provider"
             android:exported="false" />
+
     </application>
-</manifest>
+</manifest>

urbanairship-core/src/main/java/com/urbanairship/actions/WalletAction.java

@@ -2,11 +2,8 @@
 
 package com.urbanairship.actions;
 
-import android.content.Intent;
-import android.net.Uri;
 import android.os.Build;
 
-import com.urbanairship.Logger;
 import com.urbanairship.UAirship;
 
 import androidx.annotation.NonNull;
@@ -39,18 +36,6 @@ public class WalletAction extends OpenExternalUrlAction {
     @NonNull
     public static final String DEFAULT_REGISTRY_SHORT_NAME = "^w";
 
-    @NonNull
-    @Override
-    public ActionResult perform(@NonNull ActionArguments arguments) {
-        Logger.info("Processing Wallet adaptive link.");
-
-        Intent intent = new Intent(UAirship.getApplicationContext(), WalletLoadingActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.setData(Uri.parse(arguments.getValue().getString()));
-        UAirship.getApplicationContext().startActivity(intent);
-        return ActionResult.newEmptyResult();
-    }
-
     @Override
     public boolean acceptsArguments(@NonNull ActionArguments arguments) {
         // Only support Android platform

urbanairship-core/src/main/java/com/urbanairship/http/Request.java

@@ -70,8 +70,6 @@ public Void parseResponse(int status, @Nullable Map<String, List<String>> header
 
     protected boolean compressRequestBody = false;
 
-    protected boolean followRedirects = true;
-
     @NonNull
     protected final Map<String, String> responseProperties;
 
@@ -207,18 +205,6 @@ public Request setCompressRequestBody(boolean compressRequestBody) {
         return this;
     }
 
-    /**
-     * Sets whether the request must follow the redirection.
-     *
-     * @param followRedirects A boolean to follow redirection.
-     * @return The request.
-     */
-    @NonNull
-    public Request setInstanceFollowRedirects(boolean followRedirects) {
-        this.followRedirects = followRedirects;
-        return this;
-    }
-
     /**
      * Executes the request.
      *
@@ -268,7 +254,6 @@ public <T> Response<T> execute(@NonNull ResponseParser<T> parser) throws Request
             conn.setDoInput(true);
             conn.setUseCaches(false);
             conn.setAllowUserInteraction(false);
-            conn.setInstanceFollowRedirects(followRedirects);
 
             if (ifModifiedSince > 0) {
                 conn.setIfModifiedSince(ifModifiedSince);