There is a caching of InputStream instances in VarCache.fileStreams and a usage of them on several places. This produces a lot of bugs because when you use an InputStream you read it and close it, but InputStream cannot be read after it had been closed.
The stream cache cannot be easily removed because streams could come from several places - file system, bytes array, resource from ContentProvider, resource from the zipped res folder, etc.
Solution minimizes the changes to the codebase. Several changes are introduced:
Replaced the InputStream with StreamProvider, which is not holding an InputStream instance but creating a new one when you call openStream().
Separated VarCache.registerFile into two different registerFile methods to remove the isResource parameter.
Background
There is a caching of
InputStreaminstances inVarCache.fileStreamsand a usage of them on several places. This produces a lot of bugs because when you use anInputStreamyou read it and close it, butInputStreamcannot be read after it had been closed.The stream cache cannot be easily removed because streams could come from several places - file system, bytes array, resource from
ContentProvider, resource from the zipped res folder, etc.Solution minimizes the changes to the codebase. Several changes are introduced:
Replaced the
InputStreamwithStreamProvider, which is not holding anInputStreaminstance but creating a new one when you callopenStream().Separated
VarCache.registerFileinto two differentregisterFilemethods to remove theisResourceparameter.Some minor readability improvements.