Remove deprecated code in sample app (#110)

* Remove deprecated code in sample app * Make LineLoginApi class support LineEnvConfig
line · Jul 5, 2021 · 9ea7dec · 9ea7dec
1 parent e272277
commit 9ea7dec
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 73 deletions.
diff --git a/app/src/main/java/com/linecorp/linesdk/api/LineApiTestClientFactory.java b/app/src/main/java/com/linecorp/linesdk/api/LineApiTestClientFactory.java
diff --git a/app/src/main/java/com/linecorp/linesdk/auth/LineAuthenticationTestConfigFactory.java b/app/src/main/java/com/linecorp/linesdk/auth/LineAuthenticationTestConfigFactory.java
diff --git a/app/src/main/java/com/linecorp/linesdktest/BaseApisFragment.java b/app/src/main/java/com/linecorp/linesdktest/BaseApisFragment.java
@@ -3,14 +3,15 @@
 import android.app.ProgressDialog;
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
 import com.linecorp.linesdk.LineApiResponse;
 import com.linecorp.linesdk.api.LineApiClient;
-import com.linecorp.linesdk.api.LineApiTestClientFactory;
+import com.linecorp.linesdk.api.LineApiClientBuilder;
 import com.linecorp.linesdktest.settings.TestSetting;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
 import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
@@ -41,7 +42,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Bundle arguments = getArguments();
         channelId = arguments.getString(ARG_KEY_CHANNEL_ID);
-        lineApiClient = LineApiTestClientFactory.createLineApiClient(getContext(), channelId);
+        lineApiClient = new LineApiClientBuilder(requireContext(), channelId).build();
         progressDialog = new ProgressDialog(requireActivity());
     }
 

diff --git a/app/src/main/java/com/linecorp/linesdktest/SignInFragment.java b/app/src/main/java/com/linecorp/linesdktest/SignInFragment.java
@@ -12,11 +12,15 @@
 import android.widget.RadioButton;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
 import com.linecorp.linesdk.Scope;
 import com.linecorp.linesdk.auth.LineAuthenticationConfig;
 import com.linecorp.linesdk.auth.LineAuthenticationParams;
 import com.linecorp.linesdk.auth.LineAuthenticationParams.BotPrompt;
-import com.linecorp.linesdk.auth.LineAuthenticationTestConfigFactory;
 import com.linecorp.linesdk.auth.LineLoginApi;
 import com.linecorp.linesdk.auth.LineLoginResult;
 import com.linecorp.linesdktest.settings.TestSetting;
@@ -29,10 +33,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -165,9 +165,13 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
 
     @NonNull
-    private LineAuthenticationConfig createLineAuthenticationConfigForTest() {
-        return LineAuthenticationTestConfigFactory.createTestConfig(channelId,
-                !useLineAppAuthCheckbox.isChecked());
+    private LineAuthenticationConfig createLineAuthenticationConfigForTest(boolean useLineAppAuth) {
+        LineAuthenticationConfig.Builder builder = new LineAuthenticationConfig.Builder(channelId);
+
+        if (!useLineAppAuth) {
+            builder.disableLineAppAuthentication();
+        }
+        return builder.build();
     }
 
     @NonNull
@@ -234,7 +238,7 @@ public void onSignInBtnClick() {
         try {
             Intent intent = LineLoginApi.getLoginIntent(
                     getContext(),
-                    createLineAuthenticationConfigForTest(),
+                    createLineAuthenticationConfigForTest(useLineAppAuthCheckbox.isChecked()),
                     createAuthenticationParamsForTest());
             startActivityForResult(intent, REQUEST_CODE);
             addLog("Sign-in is started. [" + LOG_SEPARATOR

diff --git a/line-sdk/src/main/java/com/linecorp/linesdk/auth/LineLoginApi.java b/line-sdk/src/main/java/com/linecorp/linesdk/auth/LineLoginApi.java
@@ -55,7 +55,7 @@ public static Intent getLoginIntent(
             @NonNull LineAuthenticationParams params) {
         return getLoginIntent(
                 context,
-                new LineAuthenticationConfig.Builder(channelId).build(),
+                new LineAuthenticationConfig.Builder(channelId, context).build(),
                 params);
     }
 
@@ -73,7 +73,7 @@ public static Intent getLoginIntentWithoutLineAppAuth(
             @NonNull LineAuthenticationParams params) {
         return getLoginIntent(
                 context,
-                new LineAuthenticationConfig.Builder(channelId)
+                new LineAuthenticationConfig.Builder(channelId, context)
                         .disableLineAppAuthentication()
                         .build(),
                 params);