From ec331a259bb2957d10bc49ef51fb8776dfc9b5c5 Mon Sep 17 00:00:00 2001
From: Andrei <dan.andrei91@gmail.com>
Date: Wed, 26 Oct 2022 20:43:43 -0700
Subject: [PATCH] Cleanup obsolete social network registration step.

---
 clients/android/NewsBlur/AndroidManifest.xml  |  12 ---
 .../NewsBlur/res/drawable/facebook_logo.png   | Bin 509 -> 0 bytes
 .../NewsBlur/res/drawable/twitter_logo.webp   | Bin 1350 -> 0 bytes
 .../res/layout/activity_addsocial.xml         |  42 --------
 .../res/layout/activity_register_progress.xml |  59 ++++-------
 .../res/layout/activity_webcontainer.xml      |  22 -----
 .../res/layout/fragment_addsocial.xml         |  93 ------------------
 .../android/NewsBlur/res/values/strings.xml   |   7 --
 .../com/newsblur/activity/AddFacebook.java    |  45 ---------
 .../src/com/newsblur/activity/AddSocial.java  |  63 ------------
 .../src/com/newsblur/activity/AddTwitter.java |  45 ---------
 .../com/newsblur/activity/RegisterProgress.kt |  29 +++---
 .../newsblur/fragment/AddSocialFragment.kt    |  77 ---------------
 .../com/newsblur/network/APIConstants.java    |   3 -
 .../src/com/newsblur/network/APIManager.java  |   7 --
 15 files changed, 31 insertions(+), 473 deletions(-)
 delete mode 100644 clients/android/NewsBlur/res/drawable/facebook_logo.png
 delete mode 100644 clients/android/NewsBlur/res/drawable/twitter_logo.webp
 delete mode 100644 clients/android/NewsBlur/res/layout/activity_addsocial.xml
 delete mode 100644 clients/android/NewsBlur/res/layout/activity_webcontainer.xml
 delete mode 100644 clients/android/NewsBlur/res/layout/fragment_addsocial.xml
 delete mode 100644 clients/android/NewsBlur/src/com/newsblur/activity/AddFacebook.java
 delete mode 100644 clients/android/NewsBlur/src/com/newsblur/activity/AddSocial.java
 delete mode 100644 clients/android/NewsBlur/src/com/newsblur/activity/AddTwitter.java
 delete mode 100644 clients/android/NewsBlur/src/com/newsblur/fragment/AddSocialFragment.kt

diff --git a/clients/android/NewsBlur/AndroidManifest.xml b/clients/android/NewsBlur/AndroidManifest.xml
index 846bc0c75..90be916c8 100644
--- a/clients/android/NewsBlur/AndroidManifest.xml
+++ b/clients/android/NewsBlur/AndroidManifest.xml
@@ -47,18 +47,6 @@
             android:name=".activity.RegisterProgress"
             android:noHistory="true"
             android:label="@string/get_started" />
-		
-		<activity
-            android:name=".activity.AddTwitter"
-            android:label="@string/add_twitter" />
-		
-			<activity
-            android:name=".activity.AddFacebook"
-            android:label="@string/add_facebook" />
-		
-		<activity
-            android:name=".activity.AddSocial"
-            android:label="@string/add_friends" />
         
         <activity
             android:name=".activity.Main"
diff --git a/clients/android/NewsBlur/res/drawable/facebook_logo.png b/clients/android/NewsBlur/res/drawable/facebook_logo.png
deleted file mode 100644
index 9443a881d36999483ab09969360271d550db244d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 509
zcmeAS@N?(olHy`uVBq!ia0vp^Js`}%3?ygDZR7z`Q2{<7u0Yy4dL}ZOwB-2hhi`IQ
zw|Jy2u#1~r+Oy;0&FBCB|DU_|%(-jNfGTrZHoK?J|NQl5>&*Qj1<SS_y7~O|r<L0;
zB~-1MxcFE_-_Ap4?%#UwX7jFZ|A3~ml?3?(Gwe?|ukilI)zm}=21XxG7srr_TW{~&
z%sOl!;u^^BDZPEK)SDw^%l`jAJ4wvTyT#LKf?wi${RsW0-;07{vt9-4*tK$B^j60O
zWnWVx**mX^`%1fHtzN}xWE#4*dF5&a5eb8Y0}YJK%M8@=?!Ks(np<r6&MV>DxoEBV
zvX|x6j3*!Xl4l@%@W@FYR^!`A$!<RHb1kRyU!L#F{@9n@cs8HfEP*tkLl(k^e4J*i
z<xKP|^FFRK<6fRt+CiDA2Afr-{oeUk>e<d;l5_gbfo9cP?M5@cSc@Hc(_-MP(bCD;
z!_Lgc19rj1V-?j3{A_3D_IgRM11Z@l27){@{`YVu7$v9uU%ffj{KspH69<7Vg=&B>
zgl24iC%ISMK>lu$rqA|DH+{}CuhR@6UIHsLO8Bv!_u0oK#|oCDHBDigvSiuPEpFSF
dJUd~>7+sxcxS8!_4KSn`JYD@<);T3K0RS#A+|d94

diff --git a/clients/android/NewsBlur/res/drawable/twitter_logo.webp b/clients/android/NewsBlur/res/drawable/twitter_logo.webp
deleted file mode 100644
index 0be007e82d0e1fde630381708eac5ffbff966ec3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1350
zcmWIYbaS&~Wnc(*bqWXzu!!JdU|<jcVr@nca`XxC@M2+LV4M(oJ51I)`q0D%78M0W
zp$P(<79A`qE=)ob8d{Ve)?8V<deY%%b)~LHSROq8KmULIzyCk~KmY&#^RzD}e=3(;
zYTLW=?Tsh>PTwxu-Rl4FeS+Wbr1Rnv_5|#_J$>tm>7Q1do-!*o;Iny<`E4;zzTFw!
z^G}^U!?xngqcEwmyMKizwcCnmHHEJ4iv2aEzBBagN-oi>Yj&ty)w_4tI`RFtT@5D_
z(x%By%A0=uht9OT_k0T<Rctsb`?Acrx1&1r_i^5kSHivLJhn%#s@>3dD(AfEub{Ku
zqI&1VmtCBkl$ZA)D1N4!{iL0d2U0hcn^q~la$}wORQK|WBbjk!dvtlWeD^UIpHzAC
z>D;xlJTL5Lr1H0khkh`UIcz1drC$I0>1R(GpBKJQTQ;%r3*+jd?GKyN7$&@x_-4{9
z^15h!j^4M18U1<dwKeY8B}wI9jgeS;`**B`#(cxu`66eMMFWzT-%0!Kp?t#7xBR7C
z?t<fQCPcFoTQnd0!Ylof@8&|DzB7C~?>+QqoA}Y&Y};wma-$W0rbTj#8|NGEcoT1I
z{lx20kJ^Mt{e-9|Rwt(m9(-2EYOHItSZ#rE++m;YnB>n-7#2TPN{c!q+9kiM@zP_X
zw6M!AQWm}8M$)@$GUH`?yl39rS*xn+zi-yeYq@t_^uJd;+mNQQ-C%QI@elJg{XMg7
z`ZlXn`cG&7>E^#xR`qClZtaD<Z@adKg=?(f-)Gc(=J-J#E!kG7m-U(x{M?qMOctMT
z&UMj}%!%m}{(VnOGqr6jQFC~i+5gysLE&rvVw=jG<MWcj#H6fK=FQ1jBjTr|Ev=rQ
zI_Z)J<I2{_$GjdrNnrKzT(&ewD5JB7=ff?|l}A#Xj0`1eSkjDSnXj0c@#QH=OPg!N
zXxw-k5>mCuXye7^UJllSGuuxI81Z&0r3kTkoRblmHepJmgRs;5`<%;8e-R4p$jxKU
zS#G%5M|{K9%#{LcEy-tAHhkUj{pSjUP;Wm^22aiD#W!lWS8O`DI$&yA_<^r8W^+YW
z=2@Q*n|qVt?(Z`~@e-f26l~6F8?+UNu}(QX<1)j`OutUkCz7%c_MS`UC|q&5bHP5p
zWetC<rn3F|-nrsK`;yBZ5ssGX8<PdM8#Z^PPFeJ>G?Lw+>z5fz_e}reCP}uc*B^!)
zS=1KNcWsxkr1$JA(|eZcKFdCK>R8^sv^6<~>BeGarNw5+vCgLHrH40p1r~=XhlO^{
z+HRW==p0zQo%5PWXz`B&liF%$9G<mtf#UpUMg0-yLUvi!a!fPISvvFfuEuXO4pl4W
zKF!FQH=pUAv$3)C+O5mX4sUGyy~gaK^MQR+GPiVy@;nzg))wk>*7okkNh^0QbKNlG
zWl8p%CRW~1+gFmSwSIqCrlym->XrL_*3;TQOA=)SyLEo<iL_U`R%Lz6_sbbZZMjbu
z_07)NCcV5IcU$#W<fI4r221wNSzEtkYt%Q959X4WcQ?UHgZcme@0SLaF$(8^<;w&y
zhPjMdI*dAub`w1o`l>EbR#MPl*dWB2nfI_fQQCp?4fFk+IqmyyTJqO!Dw6x1^2GMr
h$rIIYCr|i(TV3(}Hb3V9lir%Z@bCZaWk65B0RXLCjGzDj

diff --git a/clients/android/NewsBlur/res/layout/activity_addsocial.xml b/clients/android/NewsBlur/res/layout/activity_addsocial.xml
deleted file mode 100644
index 829a555ec..000000000
--- a/clients/android/NewsBlur/res/layout/activity_addsocial.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include layout="@layout/toolbar_newsblur" />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/item_background"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <FrameLayout
-            android:id="@+id/addsocial_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="10dp"
-            android:gravity="center"
-            android:padding="20dp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:gravity="right"
-            android:padding="10dp">
-
-            <Button
-                android:id="@+id/login_addsocial_nextstep"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="10dp"
-                android:text="Start Reading"
-                android:textSize="14sp" />
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/clients/android/NewsBlur/res/layout/activity_register_progress.xml b/clients/android/NewsBlur/res/layout/activity_register_progress.xml
index 771b3b91c..d6c413340 100644
--- a/clients/android/NewsBlur/res/layout/activity_register_progress.xml
+++ b/clients/android/NewsBlur/res/layout/activity_register_progress.xml
@@ -1,18 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ViewSwitcher xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/view_switcher"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_centerHorizontal="true"
-    android:gravity="center"
-    android:inAnimation="@android:anim/fade_in"
-    android:outAnimation="@android:anim/fade_out"
-    android:padding="30dp">
+    android:orientation="vertical"
+    android:paddingHorizontal="32dp"
+    android:paddingVertical="64dp">
 
-    <LinearLayout
+    <ImageView
+        android:id="@+id/progress_logo"
+        android:layout_width="180dp"
+        android:layout_height="180dp"
+        android:layout_gravity="center_horizontal"
+        android:src="@drawable/logo" />
+
+    <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="64dp"
         android:gravity="center"
         android:orientation="horizontal">
 
@@ -22,43 +27,13 @@
             android:layout_height="40dp"
             android:layout_marginRight="10dp"
             android:indeterminate="true"
-            app:indicatorSize="32dp"/>
+            app:indicatorSize="32dp" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Registering..."
             android:textSize="20sp" />
-    </LinearLayout>
+    </androidx.appcompat.widget.LinearLayoutCompat>
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:gravity="center_horizontal"
-            android:orientation="vertical">
-
-            <ImageView
-                android:id="@+id/progress_logo"
-                android:layout_width="200dp"
-                android:layout_height="200dp"
-                android:src="@drawable/logo" />
-
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/button_next"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentBottom="true"
-            android:text="@string/login_next"
-            android:textSize="20sp" />
-    </RelativeLayout>
-
-</ViewSwitcher>
+</androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/clients/android/NewsBlur/res/layout/activity_webcontainer.xml b/clients/android/NewsBlur/res/layout/activity_webcontainer.xml
deleted file mode 100644
index 7d847026d..000000000
--- a/clients/android/NewsBlur/res/layout/activity_webcontainer.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include layout="@layout/toolbar_newsblur" />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/item_background"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <WebView
-            android:id="@+id/webcontainer"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    </RelativeLayout>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/clients/android/NewsBlur/res/layout/fragment_addsocial.xml b/clients/android/NewsBlur/res/layout/fragment_addsocial.xml
deleted file mode 100644
index 1febe9958..000000000
--- a/clients/android/NewsBlur/res/layout/fragment_addsocial.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_margin="20dp" >
-
-    <TextView
-        android:id="@+id/addsocial_connect_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="20dp"
-        android:text="@string/connect_with_your_friends"
-        android:textColor="@color/text"
-        android:textSize="18sp"
-        android:gravity="center" />
-
-    <LinearLayout
-        android:id="@+id/addsocial_twitter"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/addsocial_connect_text"
-        android:layout_gravity="center_vertical"
-        android:layout_margin="20dp"
-        android:background="@drawable/twitter_background"
-        android:orientation="horizontal"
-        android:padding="5dp" >
-
-        <ImageView
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginRight="15dp"
-            android:scaleType="centerInside"
-            android:src="@drawable/twitter_logo" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:text="@string/twitter"
-            android:id="@+id/addsocial_twitter_text"
-            android:textColor="@color/white"
-            android:textSize="16sp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/addsocial_facebook"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/addsocial_twitter"
-        android:layout_gravity="center_vertical"
-        android:layout_margin="20dp"
-        android:background="@drawable/facebook_background"
-        android:orientation="horizontal"
-        android:padding="5dp" >
-
-        <ImageView
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginRight="15dp"
-            android:scaleType="centerInside"
-            android:src="@drawable/facebook_logo" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:text="@string/facebook"
-            android:id="@+id/addsocial_facebook_text"
-            android:textColor="@color/white"
-            android:textSize="16sp" />
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/addsocial_autofollow_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/addsocial_facebook"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="30dp"
-        android:textSize="16sp"
-        android:text="@string/auto_follow_friends"
-        android:textColor="@color/text" />
-
-    <CheckBox
-        android:id="@+id/addsocial_autofollow_checkbox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:checked="true"
-        android:layout_below="@id/addsocial_facebook"
-        android:layout_alignBaseline="@id/addsocial_autofollow_text"
-        android:layout_toRightOf="@id/addsocial_autofollow_text" />
-
-</RelativeLayout>
diff --git a/clients/android/NewsBlur/res/values/strings.xml b/clients/android/NewsBlur/res/values/strings.xml
index 99daea771..23d89a8dc 100644
--- a/clients/android/NewsBlur/res/values/strings.xml
+++ b/clients/android/NewsBlur/res/values/strings.xml
@@ -254,13 +254,6 @@
     <string name="login_registration_register">Register</string>
     <string name="register_message_error">There was problem registering for NewsBlur.</string>
     <string name="get_started">Let\'s get started</string>
-    <string name="add_friends">Add your friends</string>
-    <string name="connect_with_your_friends">Connect with your friends to easily follow the stories that matter to them</string>
-    <string name="twitter">Twitter</string>
-    <string name="facebook">Facebook</string>
-    <string name="auto_follow_friends">Auto-follow friends</string>
-    <string name="add_twitter">Add Twitter friends</string>
-    <string name="add_facebook">Add Facebook friends</string>
     <string name="need_to_login"><u>I need to log in!</u></string>
     <string name="need_to_register"><u>I need to register</u></string>
     <string name="public_comment_count">%d public comments</string>
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/AddFacebook.java b/clients/android/NewsBlur/src/com/newsblur/activity/AddFacebook.java
deleted file mode 100644
index e020c5ec4..000000000
--- a/clients/android/NewsBlur/src/com/newsblur/activity/AddFacebook.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.newsblur.activity;
-
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
-import com.newsblur.R;
-import com.newsblur.network.APIConstants;
-import com.newsblur.util.UIUtils;
-
-public class AddFacebook extends NbActivity {
-
-	public static final int FACEBOOK_AUTHED = 0x21;
-	private WebView webview;
-
-	@Override
-	protected void onCreate(Bundle bundle) {
-		super.onCreate(bundle);
-		setContentView(R.layout.activity_webcontainer);
-
-		UIUtils.setupToolbar(this, R.drawable.logo, getString(R.string.add_facebook), true);
-
-		webview = (WebView) findViewById(R.id.webcontainer);
-		webview.getSettings().setJavaScriptEnabled(true);
-
-		webview.setWebViewClient(new WebViewClient() {
-            // this was deprecated in API 24 but the replacement only added in the same release.
-            // the suppression can be removed when we move past 24
-            @SuppressWarnings("deprecation")
-		    public boolean shouldOverrideUrlLoading(WebView view, String url){
-		    	if (TextUtils.equals(url, APIConstants.buildUrl("/"))) {
-		    		AddFacebook.this.setResult(FACEBOOK_AUTHED);
-		    		AddFacebook.this.finish();
-		    		return true;
-		    	}
-		        view.loadUrl(url);
-		        return false;
-		   }
-		});
-		
-		webview.loadUrl(APIConstants.buildUrl(APIConstants.PATH_CONNECT_FACEBOOK));
-	}
-	
-}
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/AddSocial.java b/clients/android/NewsBlur/src/com/newsblur/activity/AddSocial.java
deleted file mode 100644
index 55d15b8e4..000000000
--- a/clients/android/NewsBlur/src/com/newsblur/activity/AddSocial.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.newsblur.activity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-
-import com.newsblur.R;
-import com.newsblur.fragment.AddSocialFragment;
-import com.newsblur.util.UIUtils;
-
-import dagger.hilt.android.AndroidEntryPoint;
-
-@AndroidEntryPoint
-public class AddSocial extends NbActivity {
-
-	private FragmentManager fragmentManager;
-	private String currentTag = "addSocialFragment";
-	private AddSocialFragment addSocialFragment;
-
-	@Override
-	protected void onCreate(Bundle bundle) {
-		super.onCreate(bundle);
-		setContentView(R.layout.activity_addsocial);
-
-		UIUtils.setupToolbar(this, R.drawable.logo, getString(R.string.add_friends), false);
-		
-		fragmentManager = getSupportFragmentManager();
-
-		if (fragmentManager.findFragmentByTag(currentTag) == null) {
-			FragmentTransaction transaction = fragmentManager.beginTransaction();
-			addSocialFragment = new AddSocialFragment();
-			transaction.add(R.id.addsocial_container, addSocialFragment, currentTag);
-			transaction.commit();
-		}
-		
-		Button nextStep = (Button) findViewById(R.id.login_addsocial_nextstep);
-		nextStep.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-                Intent i = new Intent(AddSocial.this, Main.class);
-                i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                startActivity(i);
-			}
-		});
-		
-	}
-	
-	
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
-		super.onActivityResult(requestCode, resultCode, intent);
-		switch (resultCode) {
-		case AddTwitter.TWITTER_AUTHED:
-			addSocialFragment.setTwitterAuthed();
-		case AddFacebook.FACEBOOK_AUTHED:
-			addSocialFragment.setFacebookAuthed();	
-		}
-	}
-}
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/AddTwitter.java b/clients/android/NewsBlur/src/com/newsblur/activity/AddTwitter.java
deleted file mode 100644
index 5a22c425d..000000000
--- a/clients/android/NewsBlur/src/com/newsblur/activity/AddTwitter.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.newsblur.activity;
-
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
-import com.newsblur.R;
-import com.newsblur.network.APIConstants;
-import com.newsblur.util.UIUtils;
-
-public class AddTwitter extends NbActivity {
-
-	public static final int TWITTER_AUTHED = 0x20;
-	private WebView webview;
-
-	@Override
-	protected void onCreate(Bundle bundle) {
-		super.onCreate(bundle);
-		setContentView(R.layout.activity_webcontainer);
-
-		UIUtils.setupToolbar(this, R.drawable.logo, getString(R.string.add_twitter), true);
-		
-		webview = (WebView) findViewById(R.id.webcontainer);
-		webview.getSettings().setJavaScriptEnabled(true);
-		
-		webview.setWebViewClient(new WebViewClient() {
-            // this was deprecated in API 24 but the replacement only added in the same release.
-            // the suppression can be removed when we move past 24
-            @SuppressWarnings("deprecation")
-		    public boolean shouldOverrideUrlLoading(WebView view, String url){
-		    	if (TextUtils.equals(url, APIConstants.buildUrl("/"))) {
-		    		AddTwitter.this.setResult(TWITTER_AUTHED);
-		    		AddTwitter.this.finish();
-		    		return true;
-		    	}
-		        view.loadUrl(url);
-		        return false;
-		   }
-		});
-		
-		webview.loadUrl(APIConstants.buildUrl(APIConstants.PATH_CONNECT_TWITTER));
-	}
-	
-}
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/RegisterProgress.kt b/clients/android/NewsBlur/src/com/newsblur/activity/RegisterProgress.kt
index 4ea6360f8..6b94c1a13 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/RegisterProgress.kt
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/RegisterProgress.kt
@@ -9,6 +9,7 @@ import androidx.lifecycle.lifecycleScope
 import com.newsblur.R
 import com.newsblur.databinding.ActivityRegisterProgressBinding
 import com.newsblur.network.APIManager
+import com.newsblur.network.domain.RegisterResponse
 import com.newsblur.util.PrefsUtils
 import com.newsblur.util.executeAsyncTask
 import dagger.hilt.android.AndroidEntryPoint
@@ -44,24 +45,22 @@ class RegisterProgress : FragmentActivity() {
                     apiManager.signup(username, password, email)
                 },
                 onPostExecute = {
-                    if (it.authenticated) {
-                        binding.viewSwitcher.showNext()
-                    } else {
-                        var errorMessage = it.errorMessage
-                        if (errorMessage == null) {
-                            errorMessage = resources.getString(R.string.register_message_error)
-                        }
-                        Toast.makeText(this, errorMessage, Toast.LENGTH_LONG).show()
-                        startActivity(Intent(this, Login::class.java))
-                    }
+                    if (it.authenticated) showAuth()
+                    else showError(it)
                 }
         )
-
-        binding.buttonNext.setOnClickListener { next() }
     }
 
-    private operator fun next() {
-        val i = Intent(this, AddSocial::class.java)
-        startActivity(i)
+    private fun showAuth() {
+        startActivity(Intent(this, Main::class.java).apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+        })
+    }
+
+    private fun showError(response: RegisterResponse) {
+        val errorMessage = response.errorMessage
+                ?: resources.getString(R.string.register_message_error)
+        Toast.makeText(this, errorMessage, Toast.LENGTH_LONG).show()
+        startActivity(Intent(this, Login::class.java))
     }
 }
\ No newline at end of file
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/AddSocialFragment.kt b/clients/android/NewsBlur/src/com/newsblur/fragment/AddSocialFragment.kt
deleted file mode 100644
index 48b39ac30..000000000
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/AddSocialFragment.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.newsblur.fragment
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.lifecycleScope
-import com.newsblur.R
-import com.newsblur.activity.AddFacebook
-import com.newsblur.activity.AddTwitter
-import com.newsblur.databinding.FragmentAddsocialBinding
-import com.newsblur.network.APIManager
-import com.newsblur.util.executeAsyncTask
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class AddSocialFragment : Fragment() {
-
-    @Inject
-    lateinit var apiManager: APIManager
-
-    private lateinit var binding: FragmentAddsocialBinding
-
-    private var twitterAuthed = false
-    private var facebookAuthed = false
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        retainInstance = true
-    }
-
-    fun setTwitterAuthed() {
-        twitterAuthed = true
-        authCheck()
-    }
-
-    fun setFacebookAuthed() {
-        facebookAuthed = true
-        authCheck()
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val view = inflater.inflate(R.layout.fragment_addsocial, null)
-        binding = FragmentAddsocialBinding.bind(view)
-        binding.addsocialTwitter.setOnClickListener {
-            val i = Intent(activity, AddTwitter::class.java)
-            startActivityForResult(i, 0)
-        }
-        binding.addsocialFacebook.setOnClickListener {
-            val i = Intent(activity, AddFacebook::class.java)
-            startActivityForResult(i, 0)
-        }
-        authCheck()
-        binding.addsocialAutofollowCheckbox.setOnCheckedChangeListener { _, checked ->
-            lifecycleScope.executeAsyncTask(
-                    doInBackground = {
-                        apiManager.setAutoFollow(checked)
-                    }
-            )
-        }
-        return view
-    }
-
-    private fun authCheck() {
-        if (twitterAuthed) {
-            binding.addsocialTwitterText.text = "Added Twitter friends!"
-            binding.addsocialTwitter.isEnabled = false
-        }
-        if (facebookAuthed) {
-            binding.addsocialFacebookText.text = "Added Facebook friends!"
-            binding.addsocialFacebook.isEnabled = false
-        }
-    }
-}
\ No newline at end of file
diff --git a/clients/android/NewsBlur/src/com/newsblur/network/APIConstants.java b/clients/android/NewsBlur/src/com/newsblur/network/APIConstants.java
index af64e29c3..8a5d6b926 100644
--- a/clients/android/NewsBlur/src/com/newsblur/network/APIConstants.java
+++ b/clients/android/NewsBlur/src/com/newsblur/network/APIConstants.java
@@ -35,7 +35,6 @@ public class APIConstants {
 	public static final String PATH_MY_PROFILE = "/social/load_user_profile";
 	public static final String PATH_FOLLOW = "/social/follow";
 	public static final String PATH_UNFOLLOW = "/social/unfollow";
-    public static final String PATH_AUTOFOLLOW_PREF = "/profile/set_preference";
 	public static final String PATH_USER_ACTIVITIES = "/social/activities";
 	public static final String PATH_USER_INTERACTIONS = "/social/interactions";
 	public static final String PATH_RIVER_STORIES = "/reader/river_stories";
@@ -72,8 +71,6 @@ public class APIConstants {
     public static final String PATH_READ_STORIES = "/reader/read_stories";
     public static final String PATH_MOVE_FEED_TO_FOLDERS = "/reader/move_feed_to_folders";
     public static final String PATH_SAVE_FEED_CHOOSER = "/reader/save_feed_chooser";
-    public static final String PATH_CONNECT_FACEBOOK = "/oauth/facebook_connect/";
-    public static final String PATH_CONNECT_TWITTER = "/oauth/twitter_connect/";
     public static final String PATH_SET_NOTIFICATIONS = "/notifications/feed/";
     public static final String PATH_INSTA_FETCH = "/rss_feeds/exception_retry";
     public static final String PATH_RENAME_FEED = "/reader/rename_feed";
diff --git a/clients/android/NewsBlur/src/com/newsblur/network/APIManager.java b/clients/android/NewsBlur/src/com/newsblur/network/APIManager.java
index a803d502a..2f851d78b 100644
--- a/clients/android/NewsBlur/src/com/newsblur/network/APIManager.java
+++ b/clients/android/NewsBlur/src/com/newsblur/network/APIManager.java
@@ -106,13 +106,6 @@ public class APIManager {
         return true;
     }
 
-	public boolean setAutoFollow(boolean autofollow) {
-		ContentValues values = new ContentValues();
-		values.put("autofollow_friends", autofollow ? "true" : "false");
-		final APIResponse response = post(buildUrl(APIConstants.PATH_AUTOFOLLOW_PREF), values);
-		return (!response.isError());
-	}
-
 	public NewsBlurResponse markFeedsAsRead(FeedSet fs, Long includeOlder, Long includeNewer) {
 		ValueMultimap values = new ValueMultimap();