Skip to content

Commit 8a60892

Browse files
rostikjoystickrostikjoystick
authored
Merge pull request #962 from StepicOrg/release/1.216
Release/1.216
2 parents a6a49ec + 96dd928 commit 8a60892

10 files changed

Lines changed: 35 additions & 43 deletions

File tree

‎app/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ dependencies {
162162
implementation libraries.appCompat
163163
implementation libraries.ktx
164164
implementation libraries.recyclerview
165+
implementation libraries.swiperefreshlayout
165166
implementation libraries.viewPager
166167
implementation libraries.viewPager2
167168
implementation libraries.cardView
@@ -216,7 +217,7 @@ dependencies {
216217
implementation libraries.firebaseConfig
217218
implementation libraries.firebasePerf
218219

219-
implementation libraries.facebookSdk
220+
// implementation libraries.facebookSdk
220221
implementation libraries.vkSdk
221222

222223
implementation libraries.timber

‎app/src/debug/java/org/stepik/android/domain/debug/interactor/DebugInteractor.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.stepik.android.domain.debug.interactor
22

3-
import com.facebook.login.LoginManager
43
import com.google.firebase.messaging.FirebaseMessaging
54
import com.vk.api.sdk.VK
65
import io.reactivex.Completable
@@ -33,7 +32,7 @@ constructor(
3332
sharedPreferenceHelper.putEndpointConfig(endpointConfig.ordinal)
3433
}.andThen(
3534
logoutManager.logoutCompletable {
36-
LoginManager.getInstance().logOut()
35+
// LoginManager.getInstance().logOut()
3736
VK.logout()
3837
}
3938
)

‎app/src/main/java/org/stepic/droid/base/App.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import android.webkit.WebView
66
import androidx.appcompat.app.AppCompatDelegate
77
import androidx.multidex.MultiDexApplication
88
import com.android.billingclient.api.BillingClient
9-
import com.facebook.appevents.AppEventsLogger
10-
import com.google.android.gms.security.ProviderInstaller
119
import com.squareup.leakcanary.LeakCanary
1210
import com.squareup.leakcanary.RefWatcher
1311
import com.vk.api.sdk.VK
@@ -109,7 +107,7 @@ class App : MultiDexApplication() {
109107
WebView.setWebContentsDebuggingEnabled(true)
110108
}
111109

112-
AppEventsLogger.activateApp(this)
110+
// AppEventsLogger.activateApp(this)
113111
VK.initialize(this)
114112

115113
// init AppMetrica SDK

‎app/src/main/java/org/stepic/droid/ui/adapters/SocialAuthAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class SocialAuthAdapter extends RecyclerView.Adapter<SocialAuthAdapter.So
2222
private State state;
2323

2424
public enum State {
25-
EXPANDED(1), NORMAL(2);
25+
EXPANDED(4), NORMAL(3);
2626

2727
public final int multiplier;
2828
State(int multiplier) {
@@ -56,7 +56,7 @@ public void onBindViewHolder(SocialViewHolder holder, int position) {
5656

5757
@Override
5858
public int getItemCount() {
59-
return socialList.length / state.multiplier + (socialList.length % state.multiplier == 0 ? 0 : 1);
59+
return state.multiplier;
6060
}
6161

6262
@Override

‎app/src/main/java/org/stepik/android/remote/auth/interceptor/AuthInterceptor.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.stepik.android.remote.auth.interceptor
22

33
import android.content.Context
4-
import com.facebook.login.LoginManager
54
import com.vk.api.sdk.VK
65
import okhttp3.Interceptor
76
import okhttp3.Response
@@ -113,7 +112,7 @@ constructor(
113112
extendedMessage = "failed ${oAuthResponse.code()} ${oAuthResponse.errorBody()?.string()}"
114113
if (oAuthResponse.code() == 401) {
115114
stepikLogoutManager.logout {
116-
LoginManager.getInstance().logOut()
115+
// LoginManager.getInstance().logOut()
117116
VK.logout()
118117
screenManager.showLaunchScreen(context)
119118
}

‎app/src/main/java/org/stepik/android/view/auth/model/SocialNetwork.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ enum class SocialNetwork(
1414
) : SocialAuthType {
1515
GOOGLE("google", R.drawable.ic_login_social_google),
1616
VK("vk", R.drawable.ic_login_social_vk, isNeedUseAccessTokenInsteadOfCode = true),
17-
FACEBOOK("facebook", R.drawable.ic_login_social_fb, isNeedUseAccessTokenInsteadOfCode = true),
17+
// FACEBOOK("facebook", R.drawable.ic_login_social_fb, isNeedUseAccessTokenInsteadOfCode = true),
1818
TWITTER("twitter", R.drawable.ic_login_social_twitter),
1919
GITHUB("github", R.drawable.ic_login_social_github)
2020
}

‎app/src/main/java/org/stepik/android/view/auth/ui/activity/SocialAuthActivity.kt‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ import androidx.core.view.isVisible
1212
import androidx.fragment.app.DialogFragment
1313
import androidx.lifecycle.ViewModelProvider
1414
import androidx.recyclerview.widget.GridLayoutManager
15-
import com.facebook.CallbackManager
16-
import com.facebook.FacebookCallback
17-
import com.facebook.FacebookException
18-
import com.facebook.login.LoginManager
19-
import com.facebook.login.LoginResult
2015
import com.google.android.gms.auth.api.Auth
2116
import com.google.android.gms.common.api.GoogleApiClient
2217
import com.vk.api.sdk.VK
@@ -90,7 +85,7 @@ class SocialAuthActivity : SmartLockActivityBase(), SocialAuthView {
9085
private val progressDialogFragment: DialogFragment =
9186
LoadingProgressDialogFragment.newInstance()
9287

93-
private lateinit var callbackManager: CallbackManager
88+
// private lateinit var callbackManager: CallbackManager
9489

9590
private var selectedSocialType: SocialNetwork? = null
9691

@@ -144,20 +139,20 @@ class SocialAuthActivity : SmartLockActivityBase(), SocialAuthView {
144139

145140
signInText.text = spannableSignIn
146141

147-
callbackManager = CallbackManager.Factory.create()
148-
LoginManager.getInstance().registerCallback(callbackManager, object : FacebookCallback<LoginResult> {
149-
override fun onSuccess(loginResult: LoginResult) {
150-
socialAuthPresenter
151-
.authWithNativeCode(loginResult.accessToken.token, SocialNetwork.FACEBOOK)
152-
}
153-
154-
override fun onCancel() {}
155-
156-
override fun onError(exception: FacebookException) {
157-
analytic.reportError(Analytic.Login.FACEBOOK_ERROR, exception)
158-
showNetworkError()
159-
}
160-
})
142+
// callbackManager = CallbackManager.Factory.create()
143+
// LoginManager.getInstance().registerCallback(callbackManager, object : FacebookCallback<LoginResult> {
144+
// override fun onSuccess(loginResult: LoginResult) {
145+
// socialAuthPresenter
146+
// .authWithNativeCode(loginResult.accessToken.token, SocialNetwork.FACEBOOK)
147+
// }
148+
//
149+
// override fun onCancel() {}
150+
//
151+
// override fun onError(exception: FacebookException) {
152+
// analytic.reportError(Analytic.Login.FACEBOOK_ERROR, exception)
153+
// showNetworkError()
154+
// }
155+
// })
161156

162157
if (checkPlayServices()) {
163158
googleApiClient?.registerConnectionCallbacks(object : GoogleApiClient.ConnectionCallbacks {
@@ -238,8 +233,8 @@ class SocialAuthActivity : SmartLockActivityBase(), SocialAuthView {
238233
}
239234
}
240235

241-
SocialNetwork.FACEBOOK ->
242-
LoginManager.getInstance().logInWithReadPermissions(this, listOf("email"))
236+
// SocialNetwork.FACEBOOK ->
237+
// LoginManager.getInstance().logInWithReadPermissions(this, listOf("email"))
243238

244239
SocialNetwork.VK ->
245240
VK.login(this, listOf(VKScope.OFFLINE, VKScope.EMAIL))
@@ -314,7 +309,7 @@ class SocialAuthActivity : SmartLockActivityBase(), SocialAuthView {
314309

315310
super.onActivityResult(requestCode, resultCode, data)
316311

317-
callbackManager.onActivityResult(requestCode, resultCode, data)
312+
// callbackManager.onActivityResult(requestCode, resultCode, data)
318313

319314
if (requestCode == REQUEST_CODE_GOOGLE_SIGN_IN && resultCode == Activity.RESULT_OK) {
320315
val result = Auth.GoogleSignInApi.getSignInResultFromIntent(data)
@@ -360,7 +355,7 @@ class SocialAuthActivity : SmartLockActivityBase(), SocialAuthView {
360355
Auth.GoogleSignInApi.signOut(googleApiClient)
361356
}
362357
// fb:
363-
LoginManager.getInstance().logOut()
358+
// LoginManager.getInstance().logOut()
364359
}
365360

366361
override fun showNetworkError() {

‎app/src/main/java/org/stepik/android/view/settings/ui/fragment/SettingsFragment.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import androidx.fragment.app.DialogFragment
66
import androidx.fragment.app.Fragment
77
import androidx.fragment.app.viewModels
88
import androidx.lifecycle.ViewModelProvider
9-
import com.facebook.login.LoginManager
109
import com.vk.api.sdk.VK
1110
import kotlinx.android.synthetic.main.fragment_settings.*
1211
import org.stepic.droid.R
@@ -237,7 +236,7 @@ class SettingsFragment :
237236
}
238237

239238
override fun onLogoutSuccess() {
240-
LoginManager.getInstance().logOut()
239+
// LoginManager.getInstance().logOut()
241240
VK.logout()
242241
(activity as? SignOutListener)?.onSignOut()
243242
screenManager.showLaunchScreenAfterLogout(requireContext())

‎app/src/stageDebuggable/java/org/stepik/android/domain/debug/interactor/DebugInteractor.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.stepik.android.domain.debug.interactor
22

3-
import com.facebook.login.LoginManager
43
import com.google.firebase.messaging.FirebaseMessaging
54
import com.vk.api.sdk.VK
65
import io.reactivex.Completable
@@ -33,7 +32,7 @@ constructor(
3332
sharedPreferenceHelper.putEndpointConfig(endpointConfig.ordinal)
3433
}.andThen(
3534
logoutManager.logoutCompletable {
36-
LoginManager.getInstance().logOut()
35+
// LoginManager.getInstance().logOut()
3736
VK.logout()
3837
}
3938
)

‎dependencies.gradle‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ext.versions = [
2-
code : 2244,
3-
name : '1.213',
2+
code : 2245,
3+
name : '1.216',
44

55
minSdk : 21,
66
targetSdk : 30,
@@ -25,6 +25,7 @@ ext.versions = [
2525
appCompat : '1.1.0',
2626
ktx : '1.3.0',
2727
recyclerview : '1.0.0',
28+
swiperefreshlayout : '1.1.0',
2829
viewPager : '1.0.0',
2930
viewPager2 : '1.0.0',
3031
cardView : '1.0.0',
@@ -72,7 +73,7 @@ ext.versions = [
7273

7374
billing : '4.0.0',
7475

75-
facebook : '8.1.0',
76+
// facebook : '8.1.0',
7677
vk : '2.2.3',
7778

7879
timber : '4.7.1',
@@ -139,6 +140,7 @@ ext.libraries = [
139140
appCompat : "androidx.appcompat:appcompat:$versions.appCompat",
140141
ktx : "androidx.core:core-ktx:$versions.ktx",
141142
recyclerview : "androidx.recyclerview:recyclerview:$versions.recyclerview",
143+
swiperefreshlayout : "androidx.swiperefreshlayout:swiperefreshlayout:$versions.swiperefreshlayout",
142144
viewPager : "androidx.viewpager:viewpager:$versions.viewPager",
143145
viewPager2 : "androidx.viewpager2:viewpager2:$versions.viewPager2",
144146
cardView : "androidx.cardview:cardview:$versions.cardView",
@@ -201,7 +203,7 @@ ext.libraries = [
201203
billing : "com.android.billingclient:billing:$versions.billing",
202204
billingKtx : "com.android.billingclient:billing-ktx:$versions.billing",
203205

204-
facebookSdk : "com.facebook.android:facebook-android-sdk:$versions.facebook",
206+
// facebookSdk : "com.facebook.android:facebook-android-sdk:$versions.facebook",
205207
vkSdk : "com.vk:androidsdk:$versions.vk",
206208

207209
timber : "com.jakewharton.timber:timber:$versions.timber",

0 commit comments

Comments
 (0)