Fixes the Infinite "Searching for features" that happened when pressing back on the top10 screen.

parent 45074fce
...@@ -30,6 +30,7 @@ public class EarCaptureActivity extends Activity { ...@@ -30,6 +30,7 @@ public class EarCaptureActivity extends Activity {
File location; File location;
public static final int KEY_REQUEST_IMAGE = 1; public static final int KEY_REQUEST_IMAGE = 1;
public static final int KEY_SIFT_ACTIVITY_LOADER = 2;
/* /*
* (non-Javadoc) * (non-Javadoc)
...@@ -135,8 +136,10 @@ public class EarCaptureActivity extends Activity { ...@@ -135,8 +136,10 @@ public class EarCaptureActivity extends Activity {
EarIdentifier identifier = new EarIdentifier(null); EarIdentifier identifier = new EarIdentifier(null);
Intent intent = new Intent("com.auriclon.activity_sift"); Intent intent = new Intent("com.auriclon.activity_sift");
intent.putExtra("image_path", path); intent.putExtra("image_path", path);
startActivity(intent); startActivityForResult(intent, KEY_SIFT_ACTIVITY_LOADER);
} }
} else if (requestCode == KEY_SIFT_ACTIVITY_LOADER) {
startActivity(data);
} }
} }
/* (non-Javadoc) /* (non-Javadoc)
......
...@@ -76,7 +76,8 @@ public class SIFTActivity extends Activity { ...@@ -76,7 +76,8 @@ public class SIFTActivity extends Activity {
public Object then(Task<EarIdList> task) throws Exception { public Object then(Task<EarIdList> task) throws Exception {
Intent intent = new Intent("com.auriclon.activity_select_user"); Intent intent = new Intent("com.auriclon.activity_select_user");
intent.putExtra("list", new Gson().toJson(task.getResult())); intent.putExtra("list", new Gson().toJson(task.getResult()));
startActivity(intent); setResult(0, intent);
finish();
return null; return null;
} }
}, Task.UI_THREAD_EXECUTOR); }, Task.UI_THREAD_EXECUTOR);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment