Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add instagram #131

Closed
wants to merge 5 commits into from
Closed

add instagram #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
17f6ecf
DRAFT!!! add insta (but I don't know original app instagram clientID)
zerezhka Feb 22, 2021
7c75900
add insta draft 2
zerezhka Feb 24, 2021
a1a7ae3
Merge branch 'master' into feature/add_your_inst
zerezhka Feb 24, 2021
00ddaeb
Merge branch 'master' into feature/add_your_inst
zerezhka Feb 28, 2021
cd84f1e
instagram linking
zerezhka Feb 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions Houseclub/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ android {
targetSdkVersion 30
versionCode 9
versionName "1.0.8"

Properties properties = new Properties()
if (project.rootProject.file('local.properties').canRead()) {
properties.load(project.rootProject.file("local.properties").newDataInputStream())
}

buildConfigField "String", "INSTAGRAM_APP_ID", '"'+properties.getProperty("instagramAppId")+'"'
}
buildTypes {
release {
Expand Down
12 changes: 9 additions & 3 deletions Houseclub/src/main/java/me/grishka/houseclub/api/ClubhouseAPIController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ public class ClubhouseAPIController{

private static final Uri API_URL=Uri.parse("https://www.clubhouseapi.com/api");
// private static final Uri API_URL=Uri.parse("http://192.168.0.51:8080/");
private static final String API_BUILD_ID="304";
private static final String API_BUILD_VERSION="0.1.28";
private static final String API_UA="clubhouse/"+API_BUILD_ID+" (iPhone; iOS 13.5.1; Scale/3.00)";
public static final String API_BUILD_ID="304";
public static final String API_BUILD_VERSION="0.1.28";
public static final String API_UA="clubhouse/"+API_BUILD_ID+" (iPhone; iOS 13.5.1; Scale/3.00)";

public static final String PUBNUB_PUB_KEY = "pub-c-6878d382-5ae6-4494-9099-f930f938868b";
public static final String PUBNUB_SUB_KEY = "sub-c-a4abea84-9ca3-11ea-8e71-f2b83ac9263d";
Expand Down Expand Up @@ -150,6 +150,12 @@ public void run(){
if(DEBUG)
Log.i(TAG, "Raw response: "+respStr);
BaseResponse br=gson.fromJson(respStr, BaseResponse.class);

String error;
if (!br.errorMessage.isEmpty()) error=br.errorMessage;
else error="ERROR with code " +resp.code();
br.errorMessage = error;

req.onError(new ClubhouseErrorResponse(br));
}
}
Expand Down
19 changes: 19 additions & 0 deletions Houseclub/src/main/java/me/grishka/houseclub/api/methods/UpdateInstagram.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package me.grishka.houseclub.api.methods;

import me.grishka.houseclub.api.BaseResponse;
import me.grishka.houseclub.api.ClubhouseAPIRequest;

public class UpdateInstagram extends ClubhouseAPIRequest<BaseResponse> {
public static String REDIRECT_INSTAGRAM_URL = "https://www.joinclubhouse.com/callback/instagram";
public UpdateInstagram(String code) {
super("POST", "update_instagram_username", BaseResponse.class);
requestBody = new Body(code);
}

private static class Body{
public String code;
Body(String code){
this.code = code;
}
}
}
108 changes: 106 additions & 2 deletions Houseclub/src/main/java/me/grishka/houseclub/fragments/ProfileFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,37 @@
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.WebResourceRequest;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;

import java.text.DateFormat;
import java.util.HashMap;

import me.grishka.appkit.Nav;
import me.grishka.appkit.api.Callback;
import me.grishka.appkit.api.ErrorResponse;
import me.grishka.appkit.api.SimpleCallback;
import me.grishka.appkit.fragments.LoaderFragment;
import me.grishka.appkit.imageloader.ViewImageLoader;
import me.grishka.houseclub.BuildConfig;
import me.grishka.houseclub.R;
import me.grishka.houseclub.VoiceService;
import me.grishka.houseclub.api.BaseResponse;
import me.grishka.houseclub.api.ClubhouseAPIController;
import me.grishka.houseclub.api.ClubhouseSession;
import me.grishka.houseclub.api.methods.Follow;
import me.grishka.houseclub.api.methods.GetProfile;
import me.grishka.houseclub.api.methods.InviteToApp;
import me.grishka.houseclub.api.methods.Me;
import me.grishka.houseclub.api.methods.Unfollow;
import me.grishka.houseclub.api.methods.UpdateBio;
import me.grishka.houseclub.api.methods.UpdateInstagram;
import me.grishka.houseclub.api.methods.UpdatePhoto;
import me.grishka.houseclub.api.methods.UpdateName;
import me.grishka.houseclub.api.model.FullUser;
Expand All @@ -58,6 +65,7 @@ public class ProfileFragment extends LoaderFragment{
private Button followBtn, inviteButton;
private EditText invitePhoneNum;
private View socialButtons, inviteLayout;
private WebView webView;
private boolean self;

@Override
Expand Down Expand Up @@ -90,6 +98,7 @@ public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bu
inviteButton = v.findViewById(R.id.invite_button);
invites = v.findViewById(R.id.num_of_invites);
invitePhoneNum = v.findViewById(R.id.invite_phone_num);
webView = v.findViewById(R.id.webView);

followBtn.setOnClickListener(this::onFollowClick);
instagram.setOnClickListener(this::onInstagramClick);
Expand All @@ -104,6 +113,10 @@ public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bu
inviteButton.setOnClickListener(this::onInviteClick);
}

webView.setVisibility(View.GONE);
webView.getSettings().setJavaScriptEnabled(true);
webView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true);

return v;
}

Expand Down Expand Up @@ -137,16 +150,18 @@ public void onSuccess(GetProfile.Response result){
else
followBtn.setText(user.isFollowed() ? R.string.following : R.string.follow);

if(user.twitter==null && user.instagram==null){
if(!self && user.twitter==null && user.instagram==null){
socialButtons.setVisibility(View.GONE);
}else{
socialButtons.setVisibility(View.VISIBLE);
twitter.setVisibility(user.twitter==null ? View.GONE : View.VISIBLE);
instagram.setVisibility(user.instagram==null ? View.GONE : View.VISIBLE);
instagram.setVisibility(user.instagram==null && !self ? View.GONE : View.VISIBLE);
if(user.twitter!=null)
twitter.setText(user.twitter);
if(user.instagram!=null)
instagram.setText(user.instagram);
if(self && user.instagram==null)
instagram.setText(R.string.add_instagram);
}

String joined=getString(R.string.joined_date, DateFormat.getDateInstance().format(user.timeCreated));
Expand Down Expand Up @@ -288,9 +303,98 @@ public void onError(ErrorResponse error){
}

private void onInstagramClick(View v){
if (self){
HashMap<String, String> headers = new HashMap<>();
headers.put("CH-AppBuild", ClubhouseAPIController.API_BUILD_ID);
headers.put("CH-AppVersion", ClubhouseAPIController.API_BUILD_VERSION);
headers.put("User-Agent", ClubhouseAPIController.API_UA);

headers.put("CH-DeviceId", ClubhouseSession.deviceID);
headers.put("Authorization", "Token "+ClubhouseSession.userToken);
headers.put("CH-UserID", ClubhouseSession.userID);

if (user.instagram == null) {
webView.setVisibility(View.VISIBLE);
webView.setWebViewClient(new WebViewClient() {
@Override
public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
Boolean redirect = checkRedirect(request.getUrl().toString());
view.loadUrl(request.getUrl().toString());
return redirect;
}

public boolean shouldOverrideUrlLoading(WebView view, String url) {
Boolean redirect = checkRedirect(url);
view.loadUrl(url);
return redirect;
}
});
webView.loadUrl(
"https://www.instagram.com/oauth/authorize?client_id=" +
BuildConfig.INSTAGRAM_APP_ID +
"&redirect_uri=" + UpdateInstagram.REDIRECT_INSTAGRAM_URL +
"&scope=user_profile" +
"&response_type=code",
headers
);
} else {
new AlertDialog.Builder(getActivity())
.setMessage(getString(R.string.confirm_unlink_instagram_title))
.setMessage(getString(R.string.confirm_unlink_instagram))
.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener(){
@Override
public void onClick(DialogInterface dialogInterface, int i){
new UpdateInstagram(null)
.wrapProgress(getActivity())
.setCallback(new Callback<BaseResponse>(){
@Override
public void onSuccess(BaseResponse result){
instagram.setText(R.string.add_instagram);
webView.setVisibility(View.GONE);
}

@Override
public void onError(ErrorResponse error){
error.showToast(getActivity());
}
})
.exec();
}
})
.setNegativeButton(R.string.no, null)
.show();
}
} else
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://instagram.com/"+user.instagram)));
}

private Boolean checkRedirect(String url){
if (url.startsWith(UpdateInstagram.REDIRECT_INSTAGRAM_URL)) {

// last2 chars is #_ by docs https://developers.facebook.com/docs/instagram-basic-display-api/getting-started
String code = url.substring((UpdateInstagram.REDIRECT_INSTAGRAM_URL+ "?code=").length(), url.length()-2);

new UpdateInstagram(code)
.wrapProgress(getActivity())
.setCallback(new Callback<BaseResponse>(){
@Override
public void onSuccess(BaseResponse result){
instagram.setText(R.string.instagram_linked);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add user.instagram = null;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is incorrect. better is make request to update user (in all type of change situation)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Plz can you give me your insta have alot of questions to ask you about

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zerezhka but it causes a bug, look what happens when you click after unlinking

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'll see, thx

webView.setVisibility(View.GONE);
}

@Override
public void onError(ErrorResponse error){
error.showToast(getActivity());
}
})
.exec();
return false;
} else {
return true;
}
}

private void onTwitterClick(View v){
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://twitter.com/"+user.twitter)));
}
Expand Down
5 changes: 5 additions & 0 deletions Houseclub/src/main/res/layout/profile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,11 @@
android:text="@string/invite_button_label" />

</LinearLayout>
<WebView
android:id="@+id/webView"
android:layout_width="match_parent"
android:visibility="gone"
android:layout_height="540dp"/>

</LinearLayout>

Expand Down
4 changes: 4 additions & 0 deletions Houseclub/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,8 @@
<string name="event_expired">This event has already ended</string>
<string name="log_in_to_activate">Please log in again to activate your account.</string>
<string name="ok">OK</string>
<string name="add_instagram">Link instagram</string>
<string name="confirm_unlink_instagram_title">Unlink instagram?</string>
<string name="confirm_unlink_instagram">Are you sure want to unlink instagram? It can be linked in future</string>
<string name="instagram_linked">Instagram linked, reopen page to see</string>
</resources>
2 changes: 2 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ org.gradle.jvmargs=-Xmx1536m
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true

instagramAppId=1352866981588597