Передаются не все данные между Activity через Intent

Подскажите пожалуйста в чем ошибка. При вводе названия города в EditText и нажатию кнопки во вторую активити(MainActivity) полностью передаются данные из метода city3(), при выборе метода city1() или city2() данные этих методов в MainActivity не передаются

public class CityActivity extends AppCompatActivity {

private final static String TAG = "MainTAG";
private EditText inputCity;
private Button showButton;
private static final String CITY1 = "Ufa";
private static final String CITY2 = "Kazan";
private static final String CITY3 = "Moscow";

@Override
protected void onCreate(Bundle savedInstanceState) {
    super.onCreate(savedInstanceState);
    setContentView(R.layout.activity_city);
    Log.d(TAG, "onCreate");
    init();
}

private void init() {
    showButton = findViewById(R.id.showButton);
}


public void onShowButtonClick(View view) {
    inputCity = findViewById(R.id.etInputCity);
    Log.d(TAG, "onShowButtonClick");
   switch (inputCity.getText().toString()) {
        case CITY1:
            city1();
            break;
        case CITY2:
            city2();
            break;
        case CITY3:
            city3();
            break;
        default:
            Toast.makeText(this,"NO CITY",Toast.LENGTH_LONG).show();
            break;
    }
}

private void city1() {
        String temp1 = "+7";
        String press1 = "749";
        String wind1 = "3";
        Intent intent = new Intent(this, MainActivity.class);
        intent.putExtra("city1", CITY1);
        intent.putExtra("temp1", temp1);
        intent.putExtra("press1", press1);
        intent.putExtra("wind1", wind1);
        startActivity(intent);
}

private void city2() {
    String temp2 = "+10";
    String press2 = "730";
    String wind2 = "8";
    Intent intent = new Intent(this, MainActivity.class);
    intent.putExtra("city2", CITY2);
    intent.putExtra("temp2", temp2);
    intent.putExtra("press2", press2);
    intent.putExtra("wind2", wind2);
    startActivity(intent);
}

private void city3() {
    String temp3 = "+12";
    String press3 = "750";
    String wind3 = "15";
    Intent intent = new Intent(this, MainActivity.class);
    intent.putExtra("city3", CITY3);
    intent.putExtra("temp3", temp3);
    intent.putExtra("press3", press3);
    intent.putExtra("wind3", wind3);
    startActivity(intent);
}

}

public class MainActivity extends AppCompatActivity {

private TextView cityName;
private TextView temp;
private TextView wind;
private TextView press;

@Override
protected void onCreate(Bundle savedInstanceState) {
    super.onCreate(savedInstanceState);
    setContentView(R.layout.activity_main);
    init();
    getIntentCityActivity1();
    getIntentCityActivity2();
    getIntentCityActivity3();
}


private void init() {
    cityName = findViewById(R.id.cityName);
    temp = findViewById(R.id.temp);
    wind = findViewById(R.id.wind);
    press = findViewById(R.id.press);
}

private void getIntentCityActivity1() {
    Intent intent = getIntent();
    String city1 = intent.getStringExtra("city1");
    String temp1 = intent.getStringExtra("temp1");
    String press1 = intent.getStringExtra("press1");
    String wind1 = intent.getStringExtra("wind1");
    cityName.setText(city1);
    temp.setText(temp1);
    wind.setText(wind1);
    press.setText(press1);
}

private void getIntentCityActivity2() {
    Intent intent = getIntent();
    String city2 = intent.getStringExtra("city2");
    String temp2 = intent.getStringExtra("temp2");
    String press2 = intent.getStringExtra("press2");
    String wind2 = intent.getStringExtra("wind2");
    cityName.setText(city2);
    temp.setText(temp2);
    wind.setText(wind2);
    press.setText(press2);
}

private void getIntentCityActivity3() {
    Intent intent = getIntent();
    String city3 = intent.getStringExtra("city3");
    String temp3 = intent.getStringExtra("temp3");
    String press3 = intent.getStringExtra("press3");
    String wind3 = intent.getStringExtra("wind3");
    cityName.setText(city3);
    temp.setText(temp3);
    wind.setText(wind3);
    press.setText(press3);
}

}


Ответы (0 шт):