Loading src/org/lineageos/setupwizard/FindMyDeviceActivity.java +7 −10 Original line number Diff line number Diff line Loading @@ -16,9 +16,9 @@ package org.lineageos.setupwizard; import androidx.activity.result.ActivityResult; import static org.lineageos.setupwizard.SetupWizardApp.FIND_MY_DEVICE_COMPONENTNAME; import static org.lineageos.setupwizard.SetupWizardApp.REQUEST_CODE_FIND_MY_DEVICE; import android.content.ComponentName; import android.content.Intent; import android.net.Uri; import android.view.View; Loading Loading @@ -72,16 +72,15 @@ public class FindMyDeviceActivity extends SubBaseActivity { } @Override protected void onSubactivityResult(ActivityResult activityResult) { Intent data = activityResult.getData(); protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); if (data != null && data.getBooleanExtra("onBackPressed", false)) { onStartSubactivity(); return; // Check for back press } else if(activityResult.getResultCode() == RESULT_OK) { } else if(resultCode == RESULT_OK) { onNavigateNext(); } } @Override Loading @@ -101,9 +100,7 @@ public class FindMyDeviceActivity extends SubBaseActivity { private void launchFindMyDevice() { Intent intent = new Intent(); intent.setComponent( new ComponentName("foundation.e.findmydevice", "foundation.e.findmydevice.activity.FindMyDeviceActivity")); startSubactivity(intent); intent.setComponent(FIND_MY_DEVICE_COMPONENTNAME); startActivityForResult(intent, REQUEST_CODE_FIND_MY_DEVICE); } } Loading
src/org/lineageos/setupwizard/FindMyDeviceActivity.java +7 −10 Original line number Diff line number Diff line Loading @@ -16,9 +16,9 @@ package org.lineageos.setupwizard; import androidx.activity.result.ActivityResult; import static org.lineageos.setupwizard.SetupWizardApp.FIND_MY_DEVICE_COMPONENTNAME; import static org.lineageos.setupwizard.SetupWizardApp.REQUEST_CODE_FIND_MY_DEVICE; import android.content.ComponentName; import android.content.Intent; import android.net.Uri; import android.view.View; Loading Loading @@ -72,16 +72,15 @@ public class FindMyDeviceActivity extends SubBaseActivity { } @Override protected void onSubactivityResult(ActivityResult activityResult) { Intent data = activityResult.getData(); protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); if (data != null && data.getBooleanExtra("onBackPressed", false)) { onStartSubactivity(); return; // Check for back press } else if(activityResult.getResultCode() == RESULT_OK) { } else if(resultCode == RESULT_OK) { onNavigateNext(); } } @Override Loading @@ -101,9 +100,7 @@ public class FindMyDeviceActivity extends SubBaseActivity { private void launchFindMyDevice() { Intent intent = new Intent(); intent.setComponent( new ComponentName("foundation.e.findmydevice", "foundation.e.findmydevice.activity.FindMyDeviceActivity")); startSubactivity(intent); intent.setComponent(FIND_MY_DEVICE_COMPONENTNAME); startActivityForResult(intent, REQUEST_CODE_FIND_MY_DEVICE); } }