refactoring instagram client

pavel163 · pavel163 · commit 317e87fb0063 · 2017-01-08T04:07:11.000+04:00
diff --git a/app/src/main/java/com/ebr163/socialauth/MainActivity.java b/app/src/main/java/com/ebr163/socialauth/MainActivity.java
@@ -21,7 +21,8 @@
 public class MainActivity extends AppCompatActivity implements View.OnClickListener,
         VkClient.VkProfileLoadedListener, VkClient.VkLogOutListener,
         FacebookClient.FacebookProfileLoadedListener, FacebookClient.FacebookLogOutListener,
-        GooglePlusClient.GooglePlusProfileLoadedListener, GooglePlusClient.GooglePlusLogOutListener {
+        GooglePlusClient.GooglePlusProfileLoadedListener, GooglePlusClient.GooglePlusLogOutListener,
+        InstagramClient.InstagramProfileLoadedListener, InstagramClient.InstagramLogOutListener {
 
     GooglePlusClient googlePlusClient;
     InstagramClient instagramClient;
@@ -36,7 +37,9 @@ protected void onCreate(Bundle savedInstanceState) {
         googlePlusClient.setGooglePlusProfileLoadedListener(this);
         googlePlusClient.setGooglePlusLogOutListener(this);
 
-        instagramClient = new InstagramClient(this, getString(R.string.instagramRedirectUri), getString(R.string.instagramClientId));
+        instagramClient = new InstagramClient(this);
+        instagramClient.setInstagramProfileLoadedListener(this);
+        instagramClient.setInstagramLogOutListener(this);
 
         facebookClient = new FacebookClient(this);
         facebookClient.setFacebookProfileLoadedListener(this);
@@ -57,21 +60,10 @@ public void onClick(View view) {
                 googlePlusClient.logOut();
                 break;
             case R.id.instagram:
-                instagramClient.getProfile(new InstagramClient.InstagramProfileLoadedListener() {
-                    @Override
-                    public void onProfileLoaded(InstagramProfile instagramProfile) {
-                        Toast.makeText(MainActivity.this, instagramProfile.toString(), Toast.LENGTH_SHORT).show();
-                        toNextScreen();
-                    }
-                });
+                instagramClient.getProfile();
                 break;
             case R.id.instagram_logout:
-                instagramClient.logOut(new InstagramClient.InstagramLogOutListener() {
-                    @Override
-                    public void onLogOut() {
-                        Toast.makeText(MainActivity.this, "instagram logout", Toast.LENGTH_SHORT).show();
-                    }
-                });
+                instagramClient.logOut();
                 break;
             case R.id.facebook:
                 facebookClient.getProfile();
@@ -100,8 +92,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
 
     private void toNextScreen() {
-//        startActivity(new Intent(MainActivity.this, ProfileActivity.class));
-//        finish();
+        startActivity(new Intent(MainActivity.this, ProfileActivity.class));
+        finish();
     }
 
     @Override
@@ -112,6 +104,7 @@ public void onLogOutVk() {
     @Override
     public void onVkProfileLoaded(VkProfile vkProfile) {
         Toast.makeText(MainActivity.this, "vk", Toast.LENGTH_SHORT).show();
+        toNextScreen();
     }
 
     @Override
@@ -147,4 +140,20 @@ public void onGooglePlusProfileLoaded(GooglePlusProfile googlePlusProfile) {
     @Override
     public void onErrorGooglePlusProfileLoaded(Exception exeption) {
     }
+
+    @Override
+    public void onLogOutInstagram() {
+        Toast.makeText(MainActivity.this, "instagram logout", Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void onInstagramProfileLoaded(InstagramProfile instagramProfile) {
+        Toast.makeText(MainActivity.this, instagramProfile.toString(), Toast.LENGTH_SHORT).show();
+        toNextScreen();
+    }
+
+    @Override
+    public void onErrorInstagramProfileLoaded(Exception exception) {
+
+    }
 }
diff --git a/app/src/main/java/com/ebr163/socialauth/ProfileActivity.java b/app/src/main/java/com/ebr163/socialauth/ProfileActivity.java
@@ -21,7 +21,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_profile);
         googlePlusClient = new GooglePlusClient(this);
-        instagramClient = new InstagramClient(this, getString(R.string.instagramRedirectUri), getString(R.string.instagramClientId));
+        instagramClient = new InstagramClient(this);
         facebookClient = new FacebookClient(this);
     }
 
@@ -31,12 +31,6 @@ public void onClick(View view) {
             case R.id.google_plus_logout:
                 break;
             case R.id.instagram_logout:
-                instagramClient.logOut(new InstagramClient.InstagramLogOutListener() {
-                    @Override
-                    public void onLogOut() {
-                        signOut();
-                    }
-                });
                 break;
             case R.id.facebook_logout:
                 break;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
 
     <string name="google_app_id">200921782501-vp97n0glaqr8la3odt4v5ahqfaggtp9t.apps.googleusercontent.com</string>
 
-    <string name="instagramRedirectUri">https://oauth.vk.com/blank.html</string>
-    <string name="instagramClientId">bc0cfc8d49664f9eb3f920acef8c73e1</string>
+    <string name="instagram_redirect_uri">https://oauth.vk.com/blank.html</string>
+    <string name="instagram_app_id">bc0cfc8d49664f9eb3f920acef8c73e1</string>
     <string name="facebook_app_id">360833260945108</string>
 </resources>
diff --git a/facebook/build.gradle b/facebook/build.gradle
@@ -32,6 +32,5 @@ dependencies {
     })
     testCompile 'junit:junit:4.12'
 
-    compile "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION"
     compile 'com.facebook.android:facebook-android-sdk:4.+'
 }
diff --git a/facebook/src/main/java/com/ebr163/socialauth/facebook/FacebookClient.java b/facebook/src/main/java/com/ebr163/socialauth/facebook/FacebookClient.java
@@ -1,9 +1,9 @@
 package com.ebr163.socialauth.facebook;
 
 import android.app.Activity;
+import android.app.Fragment;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 
 import com.ebr163.socialauth.facebook.model.FacebookProfile;
 import com.ebr163.socialauth.facebook.model.Location;
diff --git a/google/build.gradle b/google/build.gradle
@@ -28,7 +28,6 @@ dependencies {
     })
     testCompile 'junit:junit:4.12'
 
-    compile "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION"
     compile "com.google.android.gms:play-services-auth:$GOOGLE_PLAY_SERVICE_VERSION"
     compile "com.google.android.gms:play-services-plus:$GOOGLE_PLAY_SERVICE_VERSION"
 }
diff --git a/google/src/main/java/com/ebr163/socialauth/google/GooglePlusClient.java b/google/src/main/java/com/ebr163/socialauth/google/GooglePlusClient.java
@@ -1,9 +1,10 @@
 package com.ebr163.socialauth.google;
 
 import android.app.Activity;
+import android.app.Fragment;
+import android.content.Context;
 import android.content.Intent;
 import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.util.Log;
 
@@ -133,12 +134,18 @@ public void onResult(Status status) {
         }
     }
 
+    private Context getContext() {
+        if (fragment != null) return fragment.getActivity();
+        else return activity;
+    }
+
     private String getStringResByName(String aString) {
-        int resId = activity.getResources().getIdentifier(aString, "string", activity.getPackageName());
+        Context context = getContext();
+        int resId = context.getResources().getIdentifier(aString, "string", context.getPackageName());
         try {
-            return activity.getResources().getString(resId);
+            return context.getResources().getString(resId);
         } catch (Exception e) {
-            googlePlusProfileLoadedListener.onErrorGooglePlusProfileLoaded(new Exception("Not find google_app_id"));
+            googlePlusProfileLoadedListener.onErrorGooglePlusProfileLoaded(new Exception("Not find " + aString));
             return null;
         }
     }
diff --git a/instagram/build.gradle b/instagram/build.gradle
@@ -27,7 +27,6 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testCompile 'junit:junit:4.12'
-    compile "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION"
     compile 'com.squareup.retrofit2:retrofit:2.1.0'
     compile 'com.squareup.retrofit2:converter-gson:2.1.0'
 }
diff --git a/instagram/src/main/java/com/ebr163/socialauth/instagram/InstagramClient.java b/instagram/src/main/java/com/ebr163/socialauth/instagram/InstagramClient.java
@@ -4,7 +4,6 @@
 import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
-import android.util.Log;
 
 import com.ebr163.socialauth.instagram.model.InstagramProfile;
 import com.ebr163.socialauth.instagram.model.InstagramResponse;
@@ -21,18 +20,24 @@
 public class InstagramClient {
     private static final int INSTAGRAM_AUTH_CODE = 300;
     private static final int INSTAGRAM_LOG_OUT_CODE = 301;
+    private static final String INSTAGRAM_APP_ID = "instagram_app_id";
+    private static final String INSTAGRAM_REDIRECT_URI = "instagram_redirect_uri";
 
     private Fragment fragment;
     private Activity activity;
     private AuthorizationListener authListener;
     private LogOutListener logOutListener;
+    private InstagramLogOutListener instagramLogOutListener;
+    private InstagramProfileLoadedListener instagramProfileLoadedListener;
 
     public interface InstagramProfileLoadedListener {
-        void onProfileLoaded(InstagramProfile instagramProfile);
+        void onInstagramProfileLoaded(InstagramProfile instagramProfile);
+
+        void onErrorInstagramProfileLoaded(Exception exception);
     }
 
     public interface InstagramLogOutListener {
-        void onLogOut();
+        void onLogOutInstagram();
     }
 
     private interface AuthorizationListener {
@@ -43,35 +48,43 @@ private interface LogOutListener {
         void onLogOut();
     }
 
-    private InstagramClient(String redirectUri, String clientId) {
-        InstagramConfig.getInstance().setClientId(clientId);
-        InstagramConfig.getInstance().setRedirectUri(redirectUri);
-    }
-
-    public InstagramClient(Fragment fragment, String redirectUri, String clientId) {
-        this(redirectUri, clientId);
+    public InstagramClient(Fragment fragment) {
         this.fragment = fragment;
+        init();
     }
 
-    public InstagramClient(Activity activity, String redirectUri, String clientId) {
-        this(redirectUri, clientId);
+    public InstagramClient(Activity activity) {
         this.activity = activity;
+        init();
     }
 
-    public void getProfile(final InstagramProfileLoadedListener listener) {
+    private void init() {
+        InstagramConfig.getInstance().setClientId(getStringResByName(INSTAGRAM_APP_ID));
+        InstagramConfig.getInstance().setRedirectUri(getStringResByName(INSTAGRAM_REDIRECT_URI));
+    }
+
+    public void setInstagramLogOutListener(InstagramLogOutListener instagramLogOutListener) {
+        this.instagramLogOutListener = instagramLogOutListener;
+    }
+
+    public void setInstagramProfileLoadedListener(InstagramProfileLoadedListener instagramProfileLoadedListener) {
+        this.instagramProfileLoadedListener = instagramProfileLoadedListener;
+    }
+
+    public void getProfile() {
         authorize(new AuthorizationListener() {
             @Override
             public void onAuthorized() {
                 new InstagramRestClient().getService(InstagramService.class)
                         .getProfile(getAccessToken()).enqueue(new Callback<InstagramResponse<InstagramProfile>>() {
                     @Override
                     public void onResponse(Call<InstagramResponse<InstagramProfile>> call, Response<InstagramResponse<InstagramProfile>> response) {
-                        listener.onProfileLoaded(response.body().getData());
+                        instagramProfileLoadedListener.onInstagramProfileLoaded(response.body().getData());
                     }
 
                     @Override
                     public void onFailure(Call<InstagramResponse<InstagramProfile>> call, Throwable t) {
-                        Log.i("TAG", "onFailure: " + t.getMessage());
+                        instagramProfileLoadedListener.onErrorInstagramProfileLoaded(new Exception(t));
                     }
                 });
             }
@@ -108,11 +121,22 @@ private Context getContext() {
         else return activity;
     }
 
-    public void logOut(final InstagramLogOutListener instagramLogOutListener) {
+    private String getStringResByName(String aString) {
+        Context context = getContext();
+        int resId = context.getResources().getIdentifier(aString, "string", context.getPackageName());
+        try {
+            return context.getResources().getString(resId);
+        } catch (Exception e) {
+            instagramProfileLoadedListener.onErrorInstagramProfileLoaded(new Exception("Not find " + aString));
+            return null;
+        }
+    }
+
+    public void logOut() {
         logOutListener = new LogOutListener() {
             @Override
             public void onLogOut() {
-                instagramLogOutListener.onLogOut();
+                instagramLogOutListener.onLogOutInstagram();
             }
         };
 
diff --git a/vk/build.gradle b/vk/build.gradle
@@ -28,6 +28,5 @@ dependencies {
     })
     testCompile 'junit:junit:4.12'
 
-    compile "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION"
     compile "com.vk:androidsdk:$VK_SDK_VERSION"
 }

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,5 @@ dependencies {`
`32`	`32`	`})`
`33`	`33`	`testCompile 'junit:junit:4.12'`
`34`	`34`
`35`		`- compile "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION"`
`36`	`35`	`compile 'com.facebook.android:facebook-android-sdk:4.+'`
`37`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ dependencies {`
`28`	`28`	`})`
`29`	`29`	`testCompile 'junit:junit:4.12'`
`30`	`30`
`31`		`- compile "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION"`
`32`	`31`	`compile "com.google.android.gms:play-services-auth:$GOOGLE_PLAY_SERVICE_VERSION"`
`33`	`32`	`compile "com.google.android.gms:play-services-plus:$GOOGLE_PLAY_SERVICE_VERSION"`
`34`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ dependencies {`
`27`	`27`	`exclude group: 'com.android.support', module: 'support-annotations'`
`28`	`28`	`})`
`29`	`29`	`testCompile 'junit:junit:4.12'`
`30`		`- compile "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION"`
`31`	`30`	`compile 'com.squareup.retrofit2:retrofit:2.1.0'`
`32`	`31`	`compile 'com.squareup.retrofit2:converter-gson:2.1.0'`
`33`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,5 @@ dependencies {`
`28`	`28`	`})`
`29`	`29`	`testCompile 'junit:junit:4.12'`
`30`	`30`
`31`		`- compile "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION"`
`32`	`31`	`compile "com.vk:androidsdk:$VK_SDK_VERSION"`
`33`	`32`	`}`