Skip to content

Commit 82141b2

Browse files
committed
Remove legacy code used by Xamarin.Auth
1 parent 4c179e9 commit 82141b2

File tree

3 files changed

+3
-62
lines changed

3 files changed

+3
-62
lines changed

src/AndroidClient/androidchat/src/main/java/servicestack/net/androidchat/Extensions.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,4 @@ public static void updateUserProfile(ServerEventConnect connectMsg, MainActivity
7171
});
7272
});
7373
}
74-
75-
public static void updateCookiesFromIntent(MainActivity mainActivity, ServerEventsClient client){
76-
if (mainActivity.getIntent() == null)
77-
return;
78-
String cookieStr = mainActivity.getIntent().getStringExtra("SSCookie");
79-
if (Utils.isNullOrEmpty(cookieStr) || !cookieStr.contains(";"))
80-
return;
81-
String[] cookies = cookieStr.split(";");
82-
for (String c : cookies){
83-
String key = c.split("=")[0].trim();
84-
String val = c.split("=")[1].trim();
85-
client.getServiceClient().setCookie(key, val);
86-
}
87-
}
8874
}

src/AndroidClient/androidchat/src/main/java/servicestack/net/androidchat/LoginActivity.java

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -128,53 +128,10 @@ private void stopProgressBar(){
128128
});
129129
}
130130

131-
private void performServiceStackAuth(AndroidServiceClient client){
132-
// var ssAuth = new ServiceStackAuthenticator(
133-
// MainActivity.BaseUrl,
134-
// "twitter",
135-
// jsonServiceClient =>
136-
// {
137-
// var userDetails = jsonServiceClient.Get(new GetUserDetails());
138-
// ISharedPreferences prefs = PreferenceManager.GetDefaultSharedPreferences(this);
139-
// prefs.Edit().PutString("TwitterUserName", userDetails.UserName).Commit();
140-
// return new Account(userDetails.UserName, jsonServiceClient.CookieContainer);
141-
// });
142-
// ssAuth.Title = "Twitter / Authorize Chat";
143-
// ssAuth.ServiceClientFactory = baseUrl => client;
144-
// StartActivity(ssAuth.GetUI(this));
145-
// ssAuth.Completed += (authSender, authArgs) =>
146-
// {
147-
// if (authArgs.IsAuthenticated)
148-
// {
149-
// AccountStore.Create(this).Save(authArgs.Account, "Twitter");
150-
// StartAuthChatActivity(client, authArgs.Account);
151-
// }
152-
// };
153-
}
154-
155-
private void startAuthChatActivity(AndroidServiceClient client, Account existingAccount)
156-
{
157-
// client.CookieContainer = existingAccount.Cookies;
158-
Intent intent = new Intent(this, MainActivity.class);
159-
// intent.putExtra("SSCookie", client.CookieContainer.GetCookieHeader(new Uri(MainActivity.BaseUrl)));
160-
startActivity(intent);
161-
}
162-
163131
private void startGuestChatActivity(AndroidServiceClient client)
164132
{
165133
client.clearCookies();
166134
Intent intent = new Intent(this, MainActivity.class);
167-
intent.putExtra("SSCookie", "");
168135
startActivity(intent);
169136
}
170-
171-
private Account tryResolveAccount(){
172-
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
173-
String userName = prefs.getString("TwitterUserName", null);
174-
175-
// var existingTwitterAccount = AccountStore.Create(this).FindAccountsForService("Twitter");
176-
// var twitterAccount = existingTwitterAccount.FirstOrDefault(x => x.Username == userName);
177-
// return twitterAccount;
178-
return null;
179-
}
180137
}

src/AndroidClient/androidchat/src/main/java/servicestack/net/androidchat/MainActivity.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
import android.content.Intent;
44
import android.content.res.Configuration;
5-
import android.graphics.Bitmap;
65
import android.os.Bundle;
76
import android.support.design.widget.NavigationView;
8-
import android.support.v4.util.LruCache;
97
import android.support.v4.widget.DrawerLayout;
108
import android.support.v7.app.AppCompatActivity;
119
import android.support.v7.widget.Toolbar;
@@ -18,8 +16,9 @@
1816
import android.widget.ListView;
1917
import android.widget.Toast;
2018

19+
import com.facebook.login.LoginManager;
20+
2121
import net.servicestack.android.AndroidServerEventsClient;
22-
import net.servicestack.android.AsyncUtils;
2322
import net.servicestack.client.Utils;
2423
import net.servicestack.client.sse.ServerEventJoin;
2524
import net.servicestack.client.sse.ServerEventUser;
@@ -203,6 +202,7 @@ else if (Objects.equals(selector, "logout")){
203202
}
204203

205204
private void performLogout() {
205+
LoginManager.getInstance().logOut();
206206
App.get().getServiceClient().clearCookies();
207207
Intent intent = new Intent(getBaseContext(), LoginActivity.class);
208208
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -239,8 +239,6 @@ public boolean onCreateOptionsMenu(Menu menu) {
239239
public void onPostCreate(Bundle savedInstanceState) {
240240
super.onPostCreate(savedInstanceState);
241241

242-
Extensions.updateCookiesFromIntent(this, getClient());
243-
244242
drawerToggle.syncState();
245243
UiHelpers.resetChannelDrawer(this, navigationView, getClient().getChannels());
246244
getClient().start();

0 commit comments

Comments
 (0)