mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-16 13:27:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/fullscreenBarcode

Browse Source
This commit is contained in:
Branden Archer
2020-01-25 23:41:11 -08:00
committed by GitHub
parent fd6c66a86a 91044fdc87
commit 54ee93b0cb
2 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/test/java/protect/card_locker/ImportExportActivityTest.java
View File

@@ -71,7 +71,7 @@ public class ImportExportActivityTest
if(isInstalled)
{
registerIntentHandler(Intent.ACTION_PICK);
registerIntentHandler(Intent.ACTION_GET_CONTENT);
}
Activity activity = Robolectric.setupActivity(ImportExportActivity.class);
@@ -102,7 +102,7 @@ public class ImportExportActivityTest
if(isInstalled)
{
registerIntentHandler(Intent.ACTION_GET_CONTENT);
registerIntentHandler(Intent.ACTION_PICK);
}
Activity activity = Robolectric.setupActivity(ImportExportActivity.class);