Updated photo uploader for better Android support