Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Ear recognition
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Boston University
Ear recognition
Commits
7cbb3ebb
Commit
7cbb3ebb
authored
Nov 25, 2015
by
Josejulio Martínez Magaña
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes the Infinite "Searching for features" that happened when pressing back on the top10 screen.
parent
45074fce
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
EarCaptureActivity.java
...aluxoft/earrecognition/activities/EarCaptureActivity.java
+4
-1
SIFTActivity.java
...a/com/aluxoft/earrecognition/activities/SIFTActivity.java
+2
-1
No files found.
app/src/main/java/com/aluxoft/earrecognition/activities/EarCaptureActivity.java
View file @
7cbb3ebb
...
...
@@ -30,6 +30,7 @@ public class EarCaptureActivity extends Activity {
File
location
;
public
static
final
int
KEY_REQUEST_IMAGE
=
1
;
public
static
final
int
KEY_SIFT_ACTIVITY_LOADER
=
2
;
/*
* (non-Javadoc)
...
...
@@ -135,8 +136,10 @@ public class EarCaptureActivity extends Activity {
EarIdentifier
identifier
=
new
EarIdentifier
(
null
);
Intent
intent
=
new
Intent
(
"com.auriclon.activity_sift"
);
intent
.
putExtra
(
"image_path"
,
path
);
startActivity
(
intent
);
startActivity
ForResult
(
intent
,
KEY_SIFT_ACTIVITY_LOADER
);
}
}
else
if
(
requestCode
==
KEY_SIFT_ACTIVITY_LOADER
)
{
startActivity
(
data
);
}
}
/* (non-Javadoc)
...
...
app/src/main/java/com/aluxoft/earrecognition/activities/SIFTActivity.java
View file @
7cbb3ebb
...
...
@@ -76,7 +76,8 @@ public class SIFTActivity extends Activity {
public
Object
then
(
Task
<
EarIdList
>
task
)
throws
Exception
{
Intent
intent
=
new
Intent
(
"com.auriclon.activity_select_user"
);
intent
.
putExtra
(
"list"
,
new
Gson
().
toJson
(
task
.
getResult
()));
startActivity
(
intent
);
setResult
(
0
,
intent
);
finish
();
return
null
;
}
},
Task
.
UI_THREAD_EXECUTOR
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment