Skip to content

Commit

Permalink
added 'open in browser' for tweets
Browse files Browse the repository at this point in the history
  • Loading branch information
mariotaku committed Nov 19, 2015
1 parent b720abe commit c9a93d4
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.mariotaku.twidere.activity.support.ComposeActivity;
import org.mariotaku.twidere.util.ParseUtils;
import org.mariotaku.twidere.util.Utils;
import org.mariotaku.twidere.util.support.IntentSupport;

import java.util.List;

Expand Down Expand Up @@ -101,6 +102,7 @@ protected void onCreate(final Bundle savedInstanceState) {
}
final String packageName = mPreferences.getString(KEY_FALLBACK_TWITTER_LINK_HANDLER, null);
final Intent fallbackIntent = new Intent(Intent.ACTION_VIEW, uri);
IntentSupport.setSelector(intent, new Intent(Intent.ACTION_VIEW).addCategory(IntentSupport.CATEGORY_APP_BROWSER));
fallbackIntent.setPackage(packageName);
if (TextUtils.isEmpty(packageName) || packageManager.queryIntentActivities(fallbackIntent, 0).isEmpty()) {
final Intent pickIntent = new Intent(INTENT_ACTION_PICK_ACTIVITY);
Expand Down
8 changes: 8 additions & 0 deletions twidere/src/main/java/org/mariotaku/twidere/util/Utils.java
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@
import org.mariotaku.twidere.util.content.ContentResolverUtils;
import org.mariotaku.twidere.util.dagger.ApplicationModule;
import org.mariotaku.twidere.util.menu.TwidereMenuInfo;
import org.mariotaku.twidere.util.support.IntentSupport;
import org.mariotaku.twidere.view.CardMediaContainer.OnMediaClickListener;
import org.mariotaku.twidere.view.CardMediaContainer.PreviewStyle;
import org.mariotaku.twidere.view.ShapedImageView;
Expand Down Expand Up @@ -3766,6 +3767,13 @@ public static boolean handleMenuItemClick(Context context, Fragment fragment, Fr
}
break;
}
case R.id.open_in_browser: {
final Intent intent = new Intent(Intent.ACTION_VIEW, LinkCreator.getTwitterStatusLink(status));
intent.addCategory(Intent.CATEGORY_BROWSABLE);
// IntentSupport.setSelector(intent, new Intent(Intent.ACTION_VIEW).addCategory(IntentSupport.CATEGORY_APP_BROWSER));
context.startActivity(intent);
break;
}
default: {
if (item.getIntent() != null) {
try {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package org.mariotaku.twidere.util.support;

import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.content.Intent;
import android.os.Build;

/**
* Created by mariotaku on 15/11/18.
*/
public class IntentSupport {
@SuppressLint("InlinedApi")
public static final String CATEGORY_APP_BROWSER = Intent.CATEGORY_APP_BROWSER;

public static void setSelector(Intent intent, Intent selector) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) return;
IntentSupport15.setSelector(intent, selector);
}

@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
private static class IntentSupport15 {
public static void setSelector(Intent intent, Intent selector) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) return;
intent.setSelector(selector);
}
}
}
4 changes: 4 additions & 0 deletions twidere/src/main/res/menu/menu_detail_status.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@
android:icon="@drawable/ic_action_delete"
android:title="@string/delete"
android:visible="false" />
<item
android:id="@id/open_in_browser"
android:icon="@drawable/ic_action_web"
android:title="@string/open_in_browser" />
<item
android:id="@id/open_with_account"
android:icon="@drawable/ic_action_accounts"
Expand Down

0 comments on commit c9a93d4

Please sign in to comment.