Skip to content

Commit

Permalink
fix(survey): prevent random survey crash on onboarding
Browse files Browse the repository at this point in the history
Remove survey module as an aware service. Only rely on android provider
and sync adapter. Should fix the issue as it was probably triggered
by asynchronicity due to service loading.

Consolidate android package architecture.

see #8
  • Loading branch information
nuKs committed Dec 3, 2019
1 parent 558a47c commit c7f572c
Show file tree
Hide file tree
Showing 28 changed files with 321 additions and 1,898 deletions.
34 changes: 18 additions & 16 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -199,21 +199,6 @@
</service>
-->

<service
android:name="org.pnplab.flux.awareplugin.survey.Plugin"
android:enabled="true"
android:exported="false"
android:label="Survey Service" />

<provider
android:name="org.pnplab.flux.awareplugin.survey.Provider"
android:authorities="org.pnplab.flux.provider.survey"
android:exported="false"
android:label="Self-Reported Questionnaire"
android:syncable="true"
android:readPermission="com.aware.READ_CONTEXT_DATA"
android:writePermission="com.aware.WRITE_CONTEXT_DATA" />

<service
android:name="org.pnplab.flux.awareplugin.survey.SyncAdapter"
android:enabled="true"
Expand All @@ -228,7 +213,7 @@
android:name="org.pnplab.flux.restingstatetask.model.muse_data_recorder.MuseDataProvider"
android:authorities="org.pnplab.flux.provider.musedata"
android:exported="false"
android:label="Muse timeseries EEG data"
android:label="Muse time-series EEG data"
android:syncable="true" />

<service
Expand All @@ -241,6 +226,23 @@
<meta-data android:name="android.content.SyncAdapter" android:resource="@xml/musedata_syncadapter_config" />
</service>

<provider
android:name="org.pnplab.flux.surveytask.model.SurveyDataProvider"
android:authorities="org.pnplab.flux.provider.survey"
android:exported="false"
android:label="Self-reported questionnaire data"
android:syncable="true" />

<service
android:name="org.pnplab.flux.surveytask.model.SurveyDataSyncAdapterService"
android:enabled="true"
android:exported="false">
<intent-filter>
<action android:name="android.content.SyncAdapter" />
</intent-filter>
<meta-data android:name="android.content.SyncAdapter" android:resource="@xml/survey_syncadapter_config" />
</service>

<service
android:name="org.pnplab.flux.utils.ProcessPriorityPromotionService"
android:enabled="true"
Expand Down
Binary file added android/app/src/main/assets/resting-state.mp4
Binary file not shown.
26 changes: 0 additions & 26 deletions android/app/src/main/java/org/pnplab/flux/AwareManagerPackage.java

This file was deleted.

300 changes: 0 additions & 300 deletions android/app/src/main/java/org/pnplab/flux/ConnectorModule.java_

This file was deleted.

Loading

0 comments on commit c7f572c

Please sign in to comment.