You are 100% correct... except, the war will never end. The Koran commands them to fight until Jesus, yes Jesus—the Muslim Jesus—comes back and leads the final glorious battle where the Muslims kill every last Jew and Christian on earth.
I believe the end is nigh and our Lord and Savior is getting close to HIS return. When HE returns, Islam is over and done with.