SecondActivity: return result back to MainActivity

DwarfPorter · DwarfPorter · commit 7a51583c7a57 · 2017-11-22T22:57:42.000+03:00
diff --git a/Lesson-2/SecondActivity/app/src/main/java/ru/geekbrains/secondactivity/MainActivity.java b/Lesson-2/SecondActivity/app/src/main/java/ru/geekbrains/secondactivity/MainActivity.java
@@ -1,12 +1,24 @@
 package ru.geekbrains.secondactivity;
 
+import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.Toast;
 
 public class MainActivity extends AppCompatActivity {
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == Activity.RESULT_OK){
+            EditText num = (EditText)  findViewById(R.id.editText2);
+            num.setText(data.getStringExtra("Number"));
+        }
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/Lesson-2/SecondActivity/app/src/main/java/ru/geekbrains/secondactivity/SecondActivity.java b/Lesson-2/SecondActivity/app/src/main/java/ru/geekbrains/secondactivity/SecondActivity.java
@@ -1,5 +1,7 @@
 package ru.geekbrains.secondactivity;
 
+import android.app.Activity;
+import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
@@ -61,6 +63,10 @@ protected void onDestroy() {
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.buttonBack:
+                EditText editText = (EditText) findViewById(R.id.editText3);
+                Intent intentResult = new Intent();
+                intentResult.putExtra("Number", editText.getText().toString());
+                setResult(Activity.RESULT_OK, intentResult);
                 finish();
                 break;
             default:
diff --git a/Lesson-2/SecondActivity/app/src/main/java/ru/geekbrains/secondactivity/StartSecondActivity.java b/Lesson-2/SecondActivity/app/src/main/java/ru/geekbrains/secondactivity/StartSecondActivity.java
@@ -24,6 +24,6 @@ public void onClick(View v) {
         // Посылка сформирована, отправляем
         Intent intent = new Intent(sourceActivity, SecondActivity.class);
         intent.putExtra(TEXT, parcel);    // Отправляем посылку
-        sourceActivity.startActivity(intent);
+        sourceActivity.startActivityForResult(intent, 1);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ public void onClick(View v) {`
`24`	`24`	`// Посылка сформирована, отправляем`
`25`	`25`	`Intent intent = new Intent(sourceActivity, SecondActivity.class);`
`26`	`26`	`intent.putExtra(TEXT, parcel); // Отправляем посылку`
`27`		`- sourceActivity.startActivity(intent);`
	`27`	`+ sourceActivity.startActivityForResult(intent, 1);`
`28`	`28`	`}`
`29`	`29`	`}`