Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(fix): Listener on task #321

Merged
merged 5 commits into from
Mar 11, 2020
Merged

(fix): Listener on task #321

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf6af6a
add a async task around download
thomaszurkan-optimizely Feb 27, 2020
55175b1
load the cached file in the datafile loader to avoid doing it on the …
thomaszurkan-optimizely Feb 27, 2020
197cb2e
remove unused import
thomaszurkan-optimizely Feb 27, 2020
60a9a36
refactor to load from cache if download fails on thread. but, load re…
thomaszurkan-optimizely Mar 9, 2020
b460cc3
Merge branch 'master' into ListenerOnTask
thomaszurkan-optimizely Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,21 +291,14 @@ public String getDatafile(Context context,@RawRes Integer datafileRes){
return datafile;
}
}

if (datafileRes != null) {
return loadRawResource(context, datafileRes);
}else{
logger.error("Invalid datafile resource ID.");
return null;
}
} catch (IOException e) {
logger.error("Unable to load compiled data file", e);
return safeLoadResource(context, datafileRes);
} catch (NullPointerException e){
logger.error("Unable to find compiled data file in raw resource",e);
}
return null;
}


/**
* Starts Optimizely asynchronously
* <p>
Expand Down Expand Up @@ -341,18 +334,32 @@ public void initialize(@NonNull final Context context, @RawRes final Integer dat
datafileHandler.downloadDatafile(context, datafileConfig, getDatafileLoadedListener(context,datafileRes));
}

private String safeLoadResource(Context context, @RawRes final Integer datafileRes) {
String resource = null;
try {
if (datafileRes != null) {
resource = loadRawResource(context, datafileRes);
}
else {
logger.error("Invalid datafile resource ID.");
}
}
catch (IOException exception) {
logger.error("Error parsing resource", exception);
}
return resource;
}

DatafileLoadedListener getDatafileLoadedListener(final Context context, @RawRes final Integer datafileRes) {
return new DatafileLoadedListener() {
@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
@Override
public void onDatafileLoaded(@Nullable String datafile) {
// App is being used, i.e. in the foreground
if (datafile != null && !datafile.isEmpty()) {
injectOptimizely(context, userProfileService, datafile);
} else {
//if datafile is null than it should be able to take from cache and if not present
//in Cache than should be able to get from raw data file
injectOptimizely(context, userProfileService, getDatafile(context,datafileRes));

injectOptimizely(context, userProfileService, safeLoadResource(context, datafileRes));
}
}
};
Expand Down
7 changes: 7 additions & 0 deletions ...file-handler/src/main/java/com/optimizely/ab/android/datafile_handler/DatafileLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.optimizely.ab.android.shared.DatafileConfig;
import com.optimizely.ab.android.shared.OptlyStorage;

import org.json.JSONObject;
import org.slf4j.Logger;

import java.util.concurrent.Executor;
Expand Down Expand Up @@ -130,6 +131,12 @@ protected String doInBackground(Void... params) {
logger.warn("Unable to save new datafile");
}
}
else {
JSONObject jsonFile = datafileCache.load();
if (jsonFile != null) {
dataFile = jsonFile.toString();
}
}

return dataFile;
}
Expand Down