Merge branch 'master' of https://github.com/lbryio/lbry-android
This commit is contained in:
commit
54338a2a7d
2 changed files with 28 additions and 0 deletions
|
@ -40,6 +40,13 @@
|
|||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.SEND" />
|
||||
<category android:name="android.intent.category.DEFAULT"/>
|
||||
<data android:mimeType="video/*" />
|
||||
<data android:mimeType="image/*" />
|
||||
<data android:mimeType="text/*" />
|
||||
</intent-filter>
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
|
|
|
@ -8,6 +8,7 @@ import android.app.NotificationManager;
|
|||
import android.app.PendingIntent;
|
||||
import android.app.PictureInPictureParams;
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.ClipData;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
|
@ -560,6 +561,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
|||
|
||||
protected void onNewIntent(Intent intent) {
|
||||
super.onNewIntent(intent);
|
||||
checkSendToIntent(intent);
|
||||
checkUrlIntent(intent);
|
||||
checkNotificationOpenIntent(intent);
|
||||
}
|
||||
|
@ -814,6 +816,12 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
|||
openFragment(FileViewFragment.class, true, NavMenuItem.ID_ITEM_FOLLOWING, params);
|
||||
}
|
||||
|
||||
public void openSendTo(String path) {
|
||||
Map<String, Object> params = new HashMap<>();
|
||||
params.put("directFilePath", path);
|
||||
openFragment(PublishFormFragment.class, true, NavMenuItem.ID_ITEM_NEW_PUBLISH, params);
|
||||
}
|
||||
|
||||
public void openFileClaim(Claim claim) {
|
||||
Map<String, Object> params = new HashMap<>();
|
||||
params.put("claimId", claim.getClaimId());
|
||||
|
@ -2625,6 +2633,19 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
|
|||
LbryAnalytics.logEvent(LbryAnalytics.EVENT_LBRY_NOTIFICATION_OPEN, bundle);
|
||||
}
|
||||
|
||||
private void checkSendToIntent(Intent intent) {
|
||||
String intentAction = intent.getAction();
|
||||
if (intentAction != null && intentAction.equals("android.intent.action.SEND")) {
|
||||
ClipData clipData = intent.getClipData();
|
||||
if (clipData != null) {
|
||||
Uri uri = clipData.getItemAt(0).getUri();
|
||||
|
||||
String path = Helper.getRealPathFromURI_API19(this, uri);
|
||||
openSendTo(path);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void registerServiceActionsReceiver() {
|
||||
IntentFilter intentFilter = new IntentFilter();
|
||||
intentFilter.addAction(DownloadManager.ACTION_DOWNLOAD_EVENT);
|
||||
|
|
Loading…
Reference in a new issue