Skip to content

Commit e167cd9

Browse files
committed
resolve conflicts
1 parent db79b14 commit e167cd9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+46
-2569
lines changed

android/app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -104,52 +104,6 @@
104104
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/track-expense"/>
105105
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/submit-expense"/>
106106
</intent-filter>
107-
<intent-filter>
108-
<action android:name="android.intent.action.SEND" />
109-
<category android:name="android.intent.category.DEFAULT" />
110-
111-
<!-- Images -->
112-
<data android:mimeType="image/jpg" />
113-
<data android:mimeType="image/jpeg" />
114-
<data android:mimeType="image/gif" />
115-
<data android:mimeType="image/png" />
116-
<data android:mimeType="image/tif" />
117-
<data android:mimeType="image/tiff" />
118-
119-
<!-- Documents -->
120-
<data android:mimeType="application/pdf" />
121-
<data android:mimeType="application/msword" />
122-
<data android:mimeType="application/vnd.openxmlformats-officedocument.wordprocessingml.document" />
123-
<data android:mimeType="application/rtf" />
124-
<data android:mimeType="application/zip" />
125-
<data android:mimeType="message/rfc822" />
126-
127-
<!-- Text / HTML -->
128-
<data android:mimeType="text/plain" />
129-
<data android:mimeType="text/html" />
130-
<data android:mimeType="text/xml" />
131-
132-
<!-- Audio / Video -->
133-
<data android:mimeType="audio/mpeg" />
134-
<data android:mimeType="audio/aac" />
135-
<data android:mimeType="audio/flac" />
136-
<data android:mimeType="audio/wav" />
137-
<data android:mimeType="audio/x-wav" />
138-
<data android:mimeType="audio/mp3" />
139-
<data android:mimeType="audio/vorbis" />
140-
<data android:mimeType="audio/x-vorbis" />
141-
<data android:mimeType="audio/opus" />
142-
143-
<data android:mimeType="video/mp4" />
144-
<data android:mimeType="video/mp2t" />
145-
<data android:mimeType="video/webm" />
146-
<data android:mimeType="video/avc" />
147-
<data android:mimeType="video/hevc" />
148-
<data android:mimeType="video/x-vnd.on2.vp8" />
149-
<data android:mimeType="video/x-vnd.on2.vp9" />
150-
<data android:mimeType="video/av01" />
151-
152-
</intent-filter>
153107
</activity>
154108

155109
<meta-data

android/app/src/main/java/com/expensify/chat/ExpensifyAppPackage.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public List<NativeModule> createNativeModules(
2222
List<NativeModule> modules = new ArrayList<>();
2323

2424
modules.add(new StartupTimer(reactContext));
25-
modules.add(new ShareActionHandlerModule(reactContext));
2625

2726
return modules;
2827
}

android/app/src/main/java/com/expensify/chat/MainActivity.kt

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
package com.expensify.chat
22

3-
import android.content.Intent
3+
import expo.modules.ReactActivityDelegateWrapper
4+
45
import android.content.pm.ActivityInfo
56
import android.os.Bundle
6-
import android.util.Log
77
import android.view.KeyEvent
88
import android.view.View
99
import android.view.WindowInsets
1010
import com.expensify.chat.bootsplash.BootSplash
11-
import com.expensify.chat.intenthandler.IntentHandlerFactory
1211
import com.expensify.reactnativekeycommand.KeyCommandModule
1312
import com.facebook.react.ReactActivity
1413
import com.facebook.react.ReactActivityDelegate
1514
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
1615
import com.facebook.react.defaults.DefaultReactActivityDelegate
17-
import expo.modules.ReactActivityDelegateWrapper
1816

1917
import com.oblador.performance.RNPerformance
2018

@@ -54,25 +52,6 @@ class MainActivity : ReactActivity() {
5452
defaultInsets.systemWindowInsetBottom
5553
)
5654
}
57-
58-
if (intent != null) {
59-
handleIntent(intent)
60-
}
61-
}
62-
63-
override fun onNewIntent(intent: Intent) {
64-
super.onNewIntent(intent)
65-
setIntent(intent) // Must store the new intent unless getIntent() will return the old one
66-
handleIntent(intent)
67-
}
68-
69-
private fun handleIntent(intent: Intent) {
70-
try {
71-
val intenthandler = IntentHandlerFactory.getIntentHandler(this, intent.type, intent.toString())
72-
intenthandler?.handle(intent)
73-
} catch (exception: Exception) {
74-
Log.e("handleIntentException", exception.toString())
75-
}
7655
}
7756

7857
/**

android/app/src/main/java/com/expensify/chat/ShareActionHandlerModule.kt

Lines changed: 0 additions & 89 deletions
This file was deleted.

android/app/src/main/java/com/expensify/chat/intentHandler/AbstractIntentHandler.kt

Lines changed: 0 additions & 19 deletions
This file was deleted.

android/app/src/main/java/com/expensify/chat/intentHandler/FileIntentHandler.kt

Lines changed: 0 additions & 42 deletions
This file was deleted.

android/app/src/main/java/com/expensify/chat/intentHandler/IntentHandler.kt

Lines changed: 0 additions & 12 deletions
This file was deleted.

android/app/src/main/java/com/expensify/chat/intentHandler/IntentHandlerFactory.kt

Lines changed: 0 additions & 15 deletions
This file was deleted.

android/app/src/main/java/com/expensify/chat/intentHandler/ShareFileObject.kt

Lines changed: 0 additions & 15 deletions
This file was deleted.

android/app/src/main/java/com/expensify/chat/intentHandler/TextIntentHandler.kt

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)