That would only apply after the time he is here, not for activities before retroactively.

I believe it's an open legal question. That's one reason why the prison at gitmo is where it is, so that the prisoners there were never brought on to US soil where the court system has the potential to grant them more rights.