Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed creation of double instances in memory graph activity, this fixes #627 #632

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Fixed creation of double instances in memory graph activity, this fixes #627 #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:tag="http://schemas.android.com/apk/distribution"
package="io.neurolab">

<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
Expand Down Expand Up @@ -70,7 +71,9 @@
<activity
android:name=".activities.MeditationActivity"
android:label="@string/meditation_activity_label" />
<activity android:name=".activities.MemoryGraphParent" />
<activity android:name=".activities.MemoryGraphParent"
android:launchMode="singleInstance"
/>
<activity
android:name=".communication.bluetooth.BluetoothTestActivity"
android:parentActivityName=".main.NeuroLab" />
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/io/neurolab/fragments/MemoryGraphFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ private void buildInstructionDialog() {
.setPositiveButton(R.string.focus_test_msg, (dialog, which) -> {
Intent intent = new Intent(getContext(), DataLoggerActivity.class);
intent.putExtra(ProgramModeActivity.PROGRAM_FLAG_KEY, MemoryGraphParent.MEMORY_GRAPH_FLAG);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK|Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reformat the code. It will add spaces in between |'s

startActivity(intent);
})
.create();
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/layout/activity_share_data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Avoid making changes in unrelated files.

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
Expand Down