mirror/SmartTube
1
0
Fork 0
mirror of https://github.com/yuliskov/SmartTube.git synced 2026-01-06 22:10:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

sign in fix

Browse Source
This commit is contained in:
Yuriy Liskov
2024-09-22 15:40:17 +03:00
parent 47b52db63e
commit 37ef3f7fd0
7 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaServiceCore

Submodule MediaServiceCore updated: a09c2c247b...dcd90f832f

2
README.md
View File

@@ -177,7 +177,7 @@ You can report in our Telegram group or via [issue tracker on Github](https://gi
> **Telegram group (international)**: [@SmartTubeEN](http://t.me/SmartTubeEN)
> **Telegram group (RU/UA)**: [@SmartTubeUA](http://t.me/SmartTubeUA)
> **Email**: first.hash at gmail dot com
> **Email**: firsth<!-- abc@def -->ash@gmai<!-- @abc.com -->l.com
The international group is in **English only**. But don't worry if your English is not perfect, we have a friendly international community.

2
SharedModules

Submodule SharedModules updated: ee7ca4b2c1...19a3e08ec5

5
common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/errors/CategoryEmptyError.java
View File

@@ -2,8 +2,7 @@ package com.liskovsoft.smartyoutubetv2.common.app.models.errors;
import android.content.Context;
import com.liskovsoft.smartyoutubetv2.common.R;
import com.liskovsoft.smartyoutubetv2.common.app.views.SignInView;
import com.liskovsoft.smartyoutubetv2.common.app.views.ViewManager;
import com.liskovsoft.smartyoutubetv2.common.app.presenters.YTSignInPresenter;
public class CategoryEmptyError implements ErrorFragmentData {
private final Context mContext;
@@ -14,7 +13,7 @@ public class CategoryEmptyError implements ErrorFragmentData {
@Override
public void onAction() {
ViewManager.instance(mContext).startView(SignInView.class);
YTSignInPresenter.instance(mContext).start();
}
@Override

5
common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/errors/SignInError.java
View File

@@ -2,8 +2,7 @@ package com.liskovsoft.smartyoutubetv2.common.app.models.errors;
import android.content.Context;
import com.liskovsoft.smartyoutubetv2.common.R;
import com.liskovsoft.smartyoutubetv2.common.app.views.SignInView;
import com.liskovsoft.smartyoutubetv2.common.app.views.ViewManager;
import com.liskovsoft.smartyoutubetv2.common.app.presenters.YTSignInPresenter;
public class SignInError implements ErrorFragmentData {
private final Context mContext;
@@ -14,7 +13,7 @@ public class SignInError implements ErrorFragmentData {
@Override
public void onAction() {
ViewManager.instance(mContext).startView(SignInView.class);
YTSignInPresenter.instance(mContext).start();
}
@Override

8
common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/SignInPresenter.java
View File

@@ -49,12 +49,12 @@ public class SignInPresenter extends BasePresenter<SignInView> {
mPresenter = YTSignInPresenter.instance(getContext());
} else if (GoogleSignInPresenter.instance(getContext()).isWaiting()) {
mPresenter = GoogleSignInPresenter.instance(getContext());
} else {
throw new IllegalStateException("At least one nested sign in presenter should be initialized.");
}
if (mPresenter != null) {
mPresenter.setView(getView());
mPresenter.onViewInitialized();
}
mPresenter.setView(getView());
mPresenter.onViewInitialized();
}
public void onActionClicked() {

6
common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/YTSignInPresenter.java
View File

@@ -13,9 +13,9 @@ import io.reactivex.disposables.Disposable;
public class YTSignInPresenter extends SignInPresenter {
private static final String TAG = YTSignInPresenter.class.getSimpleName();
//private static final String SIGN_IN_URL_SHORT = "https://yt.be/activate"; // doesn't support query params, no search history
//private static final String SIGN_IN_URL_FULL = "https://youtube.com/tv/activate"; // support query params, no search history
private static final String SIGN_IN_URL = "https://youtube.com/activate"; // supports search history
private static final String SIGN_IN_URL = "https://yt.be/activate"; // 18+, no search history
//private static final String SIGN_IN_URL = "https://youtube.com/tv/activate"; // 18+, no search history
//private static final String SIGN_IN_URL = "https://youtube.com/activate"; // age restricted, supports search history
@SuppressLint("StaticFieldLeak")
private static YTSignInPresenter sInstance;
private final ServiceManager mService;