toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MM-21288 Fix attaching files on Android (#3805)

Browse source
This commit is contained in:
Elias Nahum 2020-01-13 22:46:27 -03:00 committed by GitHub
parent f8698d0293
commit 2951245d68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/app/src/main/AndroidManifest.xml
View file

@ -29,8 +29,7 @@
android:name=".MainActivity"
android:label="@string/app_name"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
android:windowSoftInputMode="adjustResize"
android:launchMode="singleInstance">
android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
@ -60,7 +59,8 @@
android:label="@string/app_name"
android:screenOrientation="portrait"
android:theme="@style/AppTheme"
android:taskAffinity="com.mattermost.share">
android:taskAffinity="com.mattermost.share"
android:launchMode="singleInstance">
<intent-filter>
<action android:name="android.intent.action.SEND" />
<action android:name="android.intent.action.SEND_MULTIPLE" />

9
app/mattermost.js
View file

@ -1,7 +1,7 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
import {Linking, NativeModules, Platform} from 'react-native';
import {Linking} from 'react-native';
import {Navigation} from 'react-native-navigation';
import {Provider} from 'react-redux';
@ -21,9 +21,6 @@ import EphemeralStore from 'app/store/ephemeral_store';
import telemetry from 'app/telemetry';
import pushNotificationsUtils from 'app/utils/push_notifications';
const {MattermostShare} = NativeModules;
const sharedExtensionStarted = Platform.OS === 'android' && MattermostShare.isOpened;
const init = async () => {
const credentials = await getAppCredentials();
if (EphemeralStore.appStarted) {
@ -39,10 +36,6 @@ const init = async () => {
registerScreens(store, Provider);
if (sharedExtensionStarted) {
EphemeralStore.appStarted = true;
}
if (!EphemeralStore.appStarted) {
launchAppAndAuthenticateIfNeeded(credentials);
}