tsanie/Pixiview
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

do not query follow/recommends when no cookie

Browse Source
This commit is contained in:
Tsanie Lily
2020-05-21 09:38:30 +08:00
parent a193eba2ae
commit f8d85ef729
1 changed files with 50 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
Pixiview/Illust/IllustCollectionPage.cs
View File

@ -521,57 +521,65 @@ namespace Pixiview.Illust
#region - Illust Tasks - #region - Illust Tasks -
private async void RedirectFailed()
{
if (!IsRedirectLogin)
{
string extra;
if (lastError != null)
{
if (lastError.Length > 40)
{
extra = $"\n{lastError.Substring(0, 40)}...";
}
else
{
extra = $"\n{lastError}";
}
}
else
{
extra = string.Empty;
}
_ = DisplayAlert(ResourceHelper.Title,
ResourceHelper.FailedResponse + extra,
ResourceHelper.Ok);
}
else
{
var result = await DisplayAlert(
ResourceHelper.Title,
ResourceHelper.ConfirmLogin,
ResourceHelper.Yes, ResourceHelper.No);
if (result)
{
AppShell.Current.PushToLogin(() =>
{
Task.Run(() => AppShell.Current.DoLoginInformation(true));
StartLoad(true);
});
}
}
IsLoading = false;
IsBottomLoading = false;
}
protected void DoLoadIllusts(bool force = false, bool bottom = false) protected void DoLoadIllusts(bool force = false, bool bottom = false)
{ {
#if DEBUG #if DEBUG
App.DebugPrint($"start loading data, force: {force}"); App.DebugPrint($"start loading data, force: {force}");
#endif #endif
if (force && string.IsNullOrEmpty(Configs.Cookie))
{
MainThread.BeginInvokeOnMainThread(RedirectFailed);
App.DebugPrint($"no cookie found");
return;
}
illustData = DoLoadIllustData(force); illustData = DoLoadIllustData(force);
if (illustData == null) if (illustData == null)
{ {
MainThread.BeginInvokeOnMainThread(async () => MainThread.BeginInvokeOnMainThread(RedirectFailed);
{
if (!IsRedirectLogin)
{
string extra;
if (lastError != null)
{
if (lastError.Length > 40)
{
extra = $"\n{lastError.Substring(0, 40)}...";
}
else
{
extra = $"\n{lastError}";
}
}
else
{
extra = string.Empty;
}
_ = DisplayAlert(ResourceHelper.Title,
ResourceHelper.FailedResponse + extra,
ResourceHelper.Ok);
}
else
{
var result = await DisplayAlert(
ResourceHelper.Title,
ResourceHelper.ConfirmLogin,
ResourceHelper.Yes, ResourceHelper.No);
if (result)
{
AppShell.Current.PushToLogin(() =>
{
Task.Run(() => AppShell.Current.DoLoginInformation(true));
StartLoad(true);
});
}
}
});
//App.DebugError("illusts.load", "failed to load illusts data."); //App.DebugError("illusts.load", "failed to load illusts data.");
IsLoading = false;
IsBottomLoading = false;
return; return;
} }
if (force && IsFavoriteVisible) if (force && IsFavoriteVisible)