Merge pull request #962 from StepicOrg/release/1.216

rostikjoystick · web-flow · commit 8a60892c20d6 · 2022-03-31T09:23:25.000+03:00
Release/1.216
diff --git a/app/build.gradle b/app/build.gradle
@@ -162,6 +162,7 @@ dependencies {
     implementation libraries.appCompat
     implementation libraries.ktx
     implementation libraries.recyclerview
+    implementation libraries.swiperefreshlayout
     implementation libraries.viewPager
     implementation libraries.viewPager2
     implementation libraries.cardView
@@ -216,7 +217,7 @@ dependencies {
     implementation libraries.firebaseConfig
     implementation libraries.firebasePerf
 
-    implementation libraries.facebookSdk
+//    implementation libraries.facebookSdk
     implementation libraries.vkSdk
 
     implementation libraries.timber
diff --git a/app/src/debug/java/org/stepik/android/domain/debug/interactor/DebugInteractor.kt b/app/src/debug/java/org/stepik/android/domain/debug/interactor/DebugInteractor.kt
@@ -1,6 +1,5 @@
 package org.stepik.android.domain.debug.interactor
 
-import com.facebook.login.LoginManager
 import com.google.firebase.messaging.FirebaseMessaging
 import com.vk.api.sdk.VK
 import io.reactivex.Completable
@@ -33,7 +32,7 @@ constructor(
             sharedPreferenceHelper.putEndpointConfig(endpointConfig.ordinal)
         }.andThen(
             logoutManager.logoutCompletable {
-                LoginManager.getInstance().logOut()
+//                LoginManager.getInstance().logOut()
                 VK.logout()
             }
         )
diff --git a/app/src/main/java/org/stepic/droid/base/App.kt b/app/src/main/java/org/stepic/droid/base/App.kt
@@ -6,8 +6,6 @@ import android.webkit.WebView
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.multidex.MultiDexApplication
 import com.android.billingclient.api.BillingClient
-import com.facebook.appevents.AppEventsLogger
-import com.google.android.gms.security.ProviderInstaller
 import com.squareup.leakcanary.LeakCanary
 import com.squareup.leakcanary.RefWatcher
 import com.vk.api.sdk.VK
@@ -109,7 +107,7 @@ class App : MultiDexApplication() {
             WebView.setWebContentsDebuggingEnabled(true)
         }
 
-        AppEventsLogger.activateApp(this)
+//        AppEventsLogger.activateApp(this)
         VK.initialize(this)
         
         // init AppMetrica SDK
diff --git a/app/src/main/java/org/stepic/droid/ui/adapters/SocialAuthAdapter.java b/app/src/main/java/org/stepic/droid/ui/adapters/SocialAuthAdapter.java
@@ -22,7 +22,7 @@ public class SocialAuthAdapter extends RecyclerView.Adapter<SocialAuthAdapter.So
     private State state;
 
     public enum State {
-        EXPANDED(1), NORMAL(2);
+        EXPANDED(4), NORMAL(3);
 
         public final int multiplier;
         State(int multiplier) {
@@ -56,7 +56,7 @@ public void onBindViewHolder(SocialViewHolder holder, int position) {
 
     @Override
     public int getItemCount() {
-        return socialList.length / state.multiplier + (socialList.length % state.multiplier == 0 ? 0 : 1);
+        return state.multiplier;
     }
 
     @Override
diff --git a/app/src/main/java/org/stepik/android/remote/auth/interceptor/AuthInterceptor.kt b/app/src/main/java/org/stepik/android/remote/auth/interceptor/AuthInterceptor.kt
@@ -1,7 +1,6 @@
 package org.stepik.android.remote.auth.interceptor
 
 import android.content.Context
-import com.facebook.login.LoginManager
 import com.vk.api.sdk.VK
 import okhttp3.Interceptor
 import okhttp3.Response
@@ -113,7 +112,7 @@ constructor(
                                     extendedMessage = "failed ${oAuthResponse.code()} ${oAuthResponse.errorBody()?.string()}"
                                     if (oAuthResponse.code() == 401) {
                                         stepikLogoutManager.logout {
-                                            LoginManager.getInstance().logOut()
+//                                            LoginManager.getInstance().logOut()
                                             VK.logout()
                                             screenManager.showLaunchScreen(context)
                                         }
diff --git a/app/src/main/java/org/stepik/android/view/auth/model/SocialNetwork.kt b/app/src/main/java/org/stepik/android/view/auth/model/SocialNetwork.kt
@@ -14,7 +14,7 @@ enum class SocialNetwork(
 ) : SocialAuthType {
     GOOGLE("google", R.drawable.ic_login_social_google),
     VK("vk", R.drawable.ic_login_social_vk, isNeedUseAccessTokenInsteadOfCode = true),
-    FACEBOOK("facebook", R.drawable.ic_login_social_fb, isNeedUseAccessTokenInsteadOfCode = true),
+//    FACEBOOK("facebook", R.drawable.ic_login_social_fb, isNeedUseAccessTokenInsteadOfCode = true),
     TWITTER("twitter", R.drawable.ic_login_social_twitter),
     GITHUB("github", R.drawable.ic_login_social_github)
 }
diff --git a/app/src/main/java/org/stepik/android/view/auth/ui/activity/SocialAuthActivity.kt b/app/src/main/java/org/stepik/android/view/auth/ui/activity/SocialAuthActivity.kt
@@ -12,11 +12,6 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.GridLayoutManager
-import com.facebook.CallbackManager
-import com.facebook.FacebookCallback
-import com.facebook.FacebookException
-import com.facebook.login.LoginManager
-import com.facebook.login.LoginResult
 import com.google.android.gms.auth.api.Auth
 import com.google.android.gms.common.api.GoogleApiClient
 import com.vk.api.sdk.VK
@@ -90,7 +85,7 @@ class SocialAuthActivity : SmartLockActivityBase(), SocialAuthView {
     private val progressDialogFragment: DialogFragment =
         LoadingProgressDialogFragment.newInstance()
 
-    private lateinit var callbackManager: CallbackManager
+//    private lateinit var callbackManager: CallbackManager
 
     private var selectedSocialType: SocialNetwork? = null
 
@@ -144,20 +139,20 @@ class SocialAuthActivity : SmartLockActivityBase(), SocialAuthView {
 
         signInText.text = spannableSignIn
 
-        callbackManager = CallbackManager.Factory.create()
-        LoginManager.getInstance().registerCallback(callbackManager, object : FacebookCallback<LoginResult> {
-            override fun onSuccess(loginResult: LoginResult) {
-                socialAuthPresenter
-                    .authWithNativeCode(loginResult.accessToken.token, SocialNetwork.FACEBOOK)
-            }
-
-            override fun onCancel() {}
-
-            override fun onError(exception: FacebookException) {
-                analytic.reportError(Analytic.Login.FACEBOOK_ERROR, exception)
-                showNetworkError()
-            }
-        })
+//        callbackManager = CallbackManager.Factory.create()
+//        LoginManager.getInstance().registerCallback(callbackManager, object : FacebookCallback<LoginResult> {
+//            override fun onSuccess(loginResult: LoginResult) {
+//                socialAuthPresenter
+//                    .authWithNativeCode(loginResult.accessToken.token, SocialNetwork.FACEBOOK)
+//            }
+//
+//            override fun onCancel() {}
+//
+//            override fun onError(exception: FacebookException) {
+//                analytic.reportError(Analytic.Login.FACEBOOK_ERROR, exception)
+//                showNetworkError()
+//            }
+//        })
 
         if (checkPlayServices()) {
             googleApiClient?.registerConnectionCallbacks(object : GoogleApiClient.ConnectionCallbacks {
@@ -238,8 +233,8 @@ class SocialAuthActivity : SmartLockActivityBase(), SocialAuthView {
                 }
             }
 
-            SocialNetwork.FACEBOOK ->
-                LoginManager.getInstance().logInWithReadPermissions(this, listOf("email"))
+//            SocialNetwork.FACEBOOK ->
+//                LoginManager.getInstance().logInWithReadPermissions(this, listOf("email"))
 
             SocialNetwork.VK ->
                 VK.login(this, listOf(VKScope.OFFLINE, VKScope.EMAIL))
@@ -314,7 +309,7 @@ class SocialAuthActivity : SmartLockActivityBase(), SocialAuthView {
 
         super.onActivityResult(requestCode, resultCode, data)
 
-        callbackManager.onActivityResult(requestCode, resultCode, data)
+//        callbackManager.onActivityResult(requestCode, resultCode, data)
 
         if (requestCode == REQUEST_CODE_GOOGLE_SIGN_IN && resultCode == Activity.RESULT_OK) {
             val result = Auth.GoogleSignInApi.getSignInResultFromIntent(data)
@@ -360,7 +355,7 @@ class SocialAuthActivity : SmartLockActivityBase(), SocialAuthView {
             Auth.GoogleSignInApi.signOut(googleApiClient)
         }
         // fb:
-        LoginManager.getInstance().logOut()
+//        LoginManager.getInstance().logOut()
     }
 
     override fun showNetworkError() {
diff --git a/app/src/main/java/org/stepik/android/view/settings/ui/fragment/SettingsFragment.kt b/app/src/main/java/org/stepik/android/view/settings/ui/fragment/SettingsFragment.kt
@@ -6,7 +6,6 @@ import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModelProvider
-import com.facebook.login.LoginManager
 import com.vk.api.sdk.VK
 import kotlinx.android.synthetic.main.fragment_settings.*
 import org.stepic.droid.R
@@ -237,7 +236,7 @@ class SettingsFragment :
     }
 
     override fun onLogoutSuccess() {
-        LoginManager.getInstance().logOut()
+//        LoginManager.getInstance().logOut()
         VK.logout()
         (activity as? SignOutListener)?.onSignOut()
         screenManager.showLaunchScreenAfterLogout(requireContext())
diff --git a/app/src/stageDebuggable/java/org/stepik/android/domain/debug/interactor/DebugInteractor.kt b/app/src/stageDebuggable/java/org/stepik/android/domain/debug/interactor/DebugInteractor.kt
@@ -1,6 +1,5 @@
 package org.stepik.android.domain.debug.interactor
 
-import com.facebook.login.LoginManager
 import com.google.firebase.messaging.FirebaseMessaging
 import com.vk.api.sdk.VK
 import io.reactivex.Completable
@@ -33,7 +32,7 @@ constructor(
             sharedPreferenceHelper.putEndpointConfig(endpointConfig.ordinal)
         }.andThen(
             logoutManager.logoutCompletable {
-                LoginManager.getInstance().logOut()
+//                LoginManager.getInstance().logOut()
                 VK.logout()
             }
         )
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,6 +1,6 @@
 ext.versions = [
-        code                 : 2244,
-        name                 : '1.213',
+        code                 : 2245,
+        name                 : '1.216',
 
         minSdk               : 21,
         targetSdk            : 30,
@@ -25,6 +25,7 @@ ext.versions = [
         appCompat            : '1.1.0',
         ktx                  : '1.3.0',
         recyclerview         : '1.0.0',
+        swiperefreshlayout   : '1.1.0',
         viewPager            : '1.0.0',
         viewPager2           : '1.0.0',
         cardView             : '1.0.0',
@@ -72,7 +73,7 @@ ext.versions = [
 
         billing              : '4.0.0',
 
-        facebook             : '8.1.0',
+//        facebook             : '8.1.0',
         vk                   : '2.2.3',
 
         timber               : '4.7.1',
@@ -139,6 +140,7 @@ ext.libraries = [
         appCompat            : "androidx.appcompat:appcompat:$versions.appCompat",
         ktx                  : "androidx.core:core-ktx:$versions.ktx",
         recyclerview         : "androidx.recyclerview:recyclerview:$versions.recyclerview",
+        swiperefreshlayout   : "androidx.swiperefreshlayout:swiperefreshlayout:$versions.swiperefreshlayout",
         viewPager            : "androidx.viewpager:viewpager:$versions.viewPager",
         viewPager2           : "androidx.viewpager2:viewpager2:$versions.viewPager2",
         cardView             : "androidx.cardview:cardview:$versions.cardView",
@@ -201,7 +203,7 @@ ext.libraries = [
         billing              : "com.android.billingclient:billing:$versions.billing",
         billingKtx           : "com.android.billingclient:billing-ktx:$versions.billing",
 
-        facebookSdk          : "com.facebook.android:facebook-android-sdk:$versions.facebook",
+//        facebookSdk          : "com.facebook.android:facebook-android-sdk:$versions.facebook",
         vkSdk                : "com.vk:androidsdk:$versions.vk",
 
         timber               : "com.jakewharton.timber:timber:$versions.timber",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`package org.stepik.android.domain.debug.interactor`
`2`	`2`
`3`		`-import com.facebook.login.LoginManager`
`4`	`3`	`import com.google.firebase.messaging.FirebaseMessaging`
`5`	`4`	`import com.vk.api.sdk.VK`
`6`	`5`	`import io.reactivex.Completable`
`@@ -33,7 +32,7 @@ constructor(`
`33`	`32`	`sharedPreferenceHelper.putEndpointConfig(endpointConfig.ordinal)`
`34`	`33`	`}.andThen(`
`35`	`34`	`logoutManager.logoutCompletable {`
`36`		`- LoginManager.getInstance().logOut()`
	`35`	`+// LoginManager.getInstance().logOut()`
`37`	`36`	`VK.logout()`
`38`	`37`	`}`
`39`	`38`	`)`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ enum class SocialNetwork(`
`14`	`14`	`) : SocialAuthType {`
`15`	`15`	`GOOGLE("google", R.drawable.ic_login_social_google),`
`16`	`16`	`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),`
`18`	`18`	`TWITTER("twitter", R.drawable.ic_login_social_twitter),`
`19`	`19`	`GITHUB("github", R.drawable.ic_login_social_github)`
`20`	`20`	`}`