You should make a ```private boolean addMode;``` field so you don't have to do ```bundle.getBoolean("Add")``` too many times. Additionally, if there have been no extras added, ```getIntent().getExtras()``` returns ```null```, which will cause a ```NullPointerException``` when doing ```bundle.getBoolean("Add")```.

You need to add:
```java
Bundle bundle = getIntent().getExtras();
addMode = bundle == null ? true : bundle.getBoolean("Add", true);
```
And then just reference to the ```addMode``` field in the future.