In a pot with a tight lid add stock or water, bring to boil, add rice reduce to lowest possible setting for 15 minutes, turn off rice and let stand until cool, 1 hour. Do not open the pot at all during this. Stir in oil while still warm, let cool further add cilantro and toss, adjust salt, and lots of pepper and toss.
Make the salad
Mix all the ingredients and let sit at room temperature for at least an hour and then re-toss.
I usually serve the rice and the salad side by side in the same bowl.