Skip to content

Commit 0042276

Browse files
naz013naz013
authored
Merge pull request #269 from naz013/feature/REM-913_Add_file_export_for_testing
REM-913 - Fix opening data file from File Manager
2 parents 719d0fb + 7ac5989 commit 0042276

21 files changed

+546
-308
lines changed

‎app/src/main/AndroidManifest.xml

Lines changed: 38 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -134,19 +134,16 @@
134134
android:scheme="content"
135135
tools:ignore="AppLinkUrlError" />
136136
<data android:mimeType="application/octet-stream" />
137+
<data android:scheme="file" />
138+
<data android:host="*" />
139+
<data android:mimeType="\*/\*" />
137140
<data android:pathPattern=".*\\.ta2" />
138-
</intent-filter>
139-
<intent-filter>
140-
<action android:name="android.intent.action.VIEW" />
141-
142-
<category android:name="android.intent.category.DEFAULT" />
143-
<category android:name="android.intent.category.BROWSABLE" />
144-
145-
<data
146-
android:scheme="content"
147-
tools:ignore="AppLinkUrlError" />
148-
<data android:mimeType="application/octet-stream" />
149-
<data android:pathPattern=".*\\.te2" />
141+
<data android:pathPattern=".*\\..*\\.ta2" />
142+
<data android:pathPattern=".*\\..*\\..*\\.ta2" />
143+
<data android:pathPattern=".*\\..*\\..*\\..*\\.ta2" />
144+
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.ta2" />
145+
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.ta2" />
146+
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.ta2" />
150147
</intent-filter>
151148
<intent-filter>
152149
<action android:name="android.intent.action.VIEW" />
@@ -159,6 +156,15 @@
159156
tools:ignore="AppLinkUrlError" />
160157
<data android:mimeType="application/octet-stream" />
161158
<data android:pathPattern=".*\\.gr2" />
159+
<data android:scheme="file" />
160+
<data android:host="*" />
161+
<data android:mimeType="*/*" />
162+
<data android:pathPattern=".*\\..*\\.gr2" />
163+
<data android:pathPattern=".*\\..*\\..*\\.gr2" />
164+
<data android:pathPattern=".*\\..*\\..*\\..*\\.gr2" />
165+
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gr2" />
166+
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.gr2" />
167+
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.gr2" />
162168
</intent-filter>
163169
<intent-filter>
164170
<action android:name="android.intent.action.VIEW" />
@@ -171,6 +177,15 @@
171177
tools:ignore="AppLinkUrlError" />
172178
<data android:mimeType="application/octet-stream" />
173179
<data android:pathPattern=".*\\.pl2" />
180+
<data android:scheme="file" />
181+
<data android:host="*" />
182+
<data android:mimeType="*/*" />
183+
<data android:pathPattern=".*\\..*\\.pl2" />
184+
<data android:pathPattern=".*\\..*\\..*\\.pl2" />
185+
<data android:pathPattern=".*\\..*\\..*\\..*\\.pl2" />
186+
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.pl2" />
187+
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.pl2" />
188+
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.pl2" />
174189
</intent-filter>
175190
<intent-filter>
176191
<action android:name="android.intent.action.VIEW" />
@@ -183,6 +198,15 @@
183198
tools:ignore="AppLinkUrlError" />
184199
<data android:mimeType="application/octet-stream" />
185200
<data android:pathPattern=".*\\.no2" />
201+
<data android:scheme="file" />
202+
<data android:host="*" />
203+
<data android:mimeType="*/*" />
204+
<data android:pathPattern=".*\\..*\\.no2" />
205+
<data android:pathPattern=".*\\..*\\..*\\.no2" />
206+
<data android:pathPattern=".*\\..*\\..*\\..*\\.no2" />
207+
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.no2" />
208+
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.no2" />
209+
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.no2" />
186210
</intent-filter>
187211
<intent-filter>
188212
<action android:name="android.intent.action.VIEW" />
@@ -210,23 +234,6 @@
210234
android:exported="true"
211235
android:label="@string/new_reminder"
212236
android:windowSoftInputMode="stateAlwaysHidden|adjustResize">
213-
<intent-filter>
214-
<action android:name="android.intent.action.VIEW" />
215-
216-
<category android:name="android.intent.category.DEFAULT" />
217-
<category android:name="android.intent.category.BROWSABLE" />
218-
219-
<data android:scheme="file" />
220-
<data android:host="*" />
221-
<data android:mimeType="\*/\*" />
222-
<data android:pathPattern=".*\\.ta2" />
223-
<data android:pathPattern=".*\\..*\\.ta2" />
224-
<data android:pathPattern=".*\\..*\\..*\\.ta2" />
225-
<data android:pathPattern=".*\\..*\\..*\\..*\\.ta2" />
226-
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.ta2" />
227-
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.ta2" />
228-
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.ta2" />
229-
</intent-filter>
230237
<intent-filter>
231238
<action android:name="android.intent.action.SEND" />
232239
<category android:name="android.intent.category.DEFAULT" />
@@ -239,72 +246,21 @@
239246
android:configChanges="keyboardHidden"
240247
android:exported="true"
241248
android:label="@string/create_group"
242-
android:windowSoftInputMode="stateUnchanged">
243-
<intent-filter>
244-
<action android:name="android.intent.action.VIEW" />
245-
246-
<category android:name="android.intent.category.DEFAULT" />
247-
<category android:name="android.intent.category.BROWSABLE" />
249+
android:windowSoftInputMode="stateUnchanged" />
248250

249-
<data android:scheme="file" />
250-
<data android:host="*" />
251-
<data android:mimeType="*/*" />
252-
<data android:pathPattern=".*\\.gr2" />
253-
<data android:pathPattern=".*\\..*\\.gr2" />
254-
<data android:pathPattern=".*\\..*\\..*\\.gr2" />
255-
<data android:pathPattern=".*\\..*\\..*\\..*\\.gr2" />
256-
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gr2" />
257-
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.gr2" />
258-
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.gr2" />
259-
</intent-filter>
260-
</activity>
261251
<activity
262252
android:name=".places.create.CreatePlaceActivity"
263253
android:configChanges="keyboardHidden"
264254
android:exported="true"
265255
android:label="@string/new_place"
266-
android:windowSoftInputMode="stateUnchanged">
267-
<intent-filter>
268-
<action android:name="android.intent.action.VIEW" />
269-
270-
<category android:name="android.intent.category.DEFAULT" />
271-
<category android:name="android.intent.category.BROWSABLE" />
256+
android:windowSoftInputMode="stateUnchanged" />
272257

273-
<data android:scheme="file" />
274-
<data android:host="*" />
275-
<data android:mimeType="*/*" />
276-
<data android:pathPattern=".*\\.pl2" />
277-
<data android:pathPattern=".*\\..*\\.pl2" />
278-
<data android:pathPattern=".*\\..*\\..*\\.pl2" />
279-
<data android:pathPattern=".*\\..*\\..*\\..*\\.pl2" />
280-
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.pl2" />
281-
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.pl2" />
282-
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.pl2" />
283-
</intent-filter>
284-
</activity>
285258
<activity
286259
android:name=".notes.create.CreateNoteActivity"
287260
android:configChanges="keyboardHidden"
288261
android:exported="true"
289262
android:label="@string/add_note"
290263
android:windowSoftInputMode="stateUnchanged">
291-
<intent-filter>
292-
<action android:name="android.intent.action.VIEW" />
293-
294-
<category android:name="android.intent.category.DEFAULT" />
295-
<category android:name="android.intent.category.BROWSABLE" />
296-
297-
<data android:scheme="file" />
298-
<data android:host="*" />
299-
<data android:mimeType="*/*" />
300-
<data android:pathPattern=".*\\.no2" />
301-
<data android:pathPattern=".*\\..*\\.no2" />
302-
<data android:pathPattern=".*\\..*\\..*\\.no2" />
303-
<data android:pathPattern=".*\\..*\\..*\\..*\\.no2" />
304-
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.no2" />
305-
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.no2" />
306-
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.no2" />
307-
</intent-filter>
308264
<intent-filter>
309265
<action android:name="org.chromium.arc.intent.action.CREATE_NOTE" />
310266

‎app/src/main/java/com/elementary/tasks/birthdays/create/EditBirthdayFragment.kt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -193,15 +193,10 @@ class EditBirthdayFragment : BaseToolbarFragment<FragmentEditBirthdayBinding>()
193193
}
194194

195195
private fun checkIntent() {
196+
Logger.i(TAG, "Received args: ${arguments?.keySet()?.toList()}")
196197
val bundle = arguments ?: return
197198
when {
198-
// arguments?.data != null -> {
199-
// permissionFlowDelegate.permissionFlow.askPermission(Permissions.READ_EXTERNAL) {
200-
// intent.data?.let { viewModel.onFile(it) }
201-
// }
202-
// }
203-
204-
bundle.containsKey(IntentKeys.INTENT_ITEM) -> viewModel.onIntent()
199+
bundle.getBoolean(IntentKeys.INTENT_ITEM, false) -> viewModel.onIntent()
205200
bundle.getBoolean(IntentKeys.INTENT_DEEP_LINK, false) -> viewModel.onDeepLink(bundle)
206201
idFromIntent().isEmpty() -> viewModel.onDateChanged(LocalDate.now())
207202
}

0 commit comments

Comments
 (0)