Closed shankari closed 7 years ago
I just checked my local code and I don't have https://github.com/e-mission/e-mission-data-collection/commit/9eb082ba6b7a41355495fcb5905ac9684b5022d9
if (intent.getAction().equals(context.getString(R.string.transition_initialize))) {
String reqConsent = getReqConsent(context);
if (!ConfigManager.isConsented(context, reqConsent)) {
Log.i(context, TAG, reqConsent + " is not the current consented version, skipping init...");
NotificationHelper.createNotification(context, STARTUP_IN_NUMBERS,
"New data collection terms - collection paused until consent");
return;
} else {
Log.i(context, TAG, reqConsent + " is the current consented version, sending msg to service...");
}
}
Why isn't the new code in here? Is it because I didn't update the plugins? Need to ensure that we have new codebase for everything...
I will ensure that I upgrade to the most recent version of all plugins in the next release, when I also make the geofence re-creation change. Then I will have some time to test the code before pushing the new release. For now, I will just make this one change locally.
Or maybe I should just say, no native changes? I need to test the other changes too, and this is a fairly simple native code change.
This was because we had linked directly to the data collection plugin, AND we had moved to the master
branch but not pulled from upstream. Pulling from upstream got it to work properly.
Doing a quick check to see if other plugins are affected.
Only other direct link is the JWT plugin
lrwxr-xr-x 1 shankari 649427843 22 May 20 21:03 edu.berkeley.eecs.emission.cordova.auth -> ../../cordova-jwt-auth
drwxr-xr-x 6 shankari 649427843 204 May 18 16:49 edu.berkeley.eecs.emission.cordova.comm
lrwxr-xr-x 1 shankari 649427843 31 May 20 21:05 edu.berkeley.eecs.emission.cordova.datacollection -> ../../e-mission-data-collection
drwxr-xr-x 8 shankari 649427843 272 May 18 16:50 edu.berkeley.eecs.emission.cordova.serversync
drwxr-xr-x 7 shankari 649427843 238 May 18 16:49 edu.berkeley.eecs.emission.cordova.settings
drwxr-xr-x 8 shankari 649427843 272 Jun 8 12:26 edu.berkeley.eecs.emission.cordova.transitionnotify
drwxr-xr-x 7 shankari 649427843 238 May 18 16:49 edu.berkeley.eecs.emission.cordova.unifiedlogger
drwxr-xr-x 7 shankari 649427843 238 May 18 16:49 edu.berkeley.eecs.emission.cordova.usercache
and it is still on the branch
C02KT61MFFT0:cordova-jwt-auth shankari$ git branch
master
* switch_to_new_auth
So I think we are good for now. Will close this issue after testing
Worked fine in testing.
I just installed e-mission on my new phone and got the "new data collection terms" message, in spite of https://github.com/e-mission/e-mission-data-collection/commit/9eb082ba6b7a41355495fcb5905ac9684b5022d9