From 590298bf5b5977ddc1677d76e8fb22099a315822 Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Sun, 23 Aug 2020 07:41:42 -0500 Subject: [PATCH 1/5] MemoryHabitList: Inherit parent's order Fixes #598 --- .../core/models/memory/MemoryHabitList.java | 1 + .../isoron/uhabits/core/models/HabitListTest.java | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java index 80a6d514a..1833f25a2 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java @@ -55,6 +55,7 @@ public class MemoryHabitList extends HabitList super(matcher); this.parent = parent; this.comparator = comparator; + this.order = parent.order; parent.getObservable().addListener(this::loadFromParent); loadFromParent(); } diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java index 206caafe6..5463ee6ea 100644 --- a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java +++ b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java @@ -31,8 +31,7 @@ import static junit.framework.TestCase.assertFalse; import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.MatcherAssert.assertThat; import static org.isoron.uhabits.core.models.HabitList.Order.*; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.Assert.*; @SuppressWarnings("JavaDoc") public class HabitListTest extends BaseUnitTest @@ -211,6 +210,17 @@ public class HabitListTest extends BaseUnitTest habitList.reorder(h1, h2); } + @Test + public void testOrder_inherit() + { + habitList.setOrder(BY_COLOR_ASC); + HabitList filteredList = habitList.getFiltered(new HabitMatcherBuilder() + .setArchivedAllowed(false) + .setCompletedAllowed(false) + .build()); + assertEquals(filteredList.getOrder(), BY_COLOR_ASC); + } + @Test public void testWriteCSV() throws IOException { From 79459c373e36dcda014994ceb311b812dfa3cb1c Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Sun, 23 Aug 2020 08:43:22 -0500 Subject: [PATCH 2/5] Manage exceptions for when activities don't exist to handle intents Fixes #181 --- .../androidbase/activities/BaseActivity.java | 14 +++++++++++ .../src/main/res/values/strings.xml | 23 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 android/android-base/src/main/res/values/strings.xml diff --git a/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseActivity.java b/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseActivity.java index 2dea22e50..3baabd315 100644 --- a/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseActivity.java +++ b/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseActivity.java @@ -126,4 +126,18 @@ abstract public class BaseActivity extends AppCompatActivity super.onResume(); if(screen != null) screen.reattachDialogs(); } + + @Override + public void startActivity(Intent intent) + { + try + { + super.startActivity(intent); + } + catch (ActivityNotFoundException e) + { + if (this.screen != null) + this.screen.showMessage(R.string.activity_not_found); + } + } } diff --git a/android/android-base/src/main/res/values/strings.xml b/android/android-base/src/main/res/values/strings.xml new file mode 100644 index 000000000..032239605 --- /dev/null +++ b/android/android-base/src/main/res/values/strings.xml @@ -0,0 +1,23 @@ + + + + + No app was found to support this action + \ No newline at end of file From ba08968600286a8827dd6bbb8fca4cd0b117bfe3 Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Wed, 18 Nov 2020 06:45:47 -0600 Subject: [PATCH 3/5] Fix tests --- .../java/org/isoron/uhabits/core/models/HabitListTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java index 5463ee6ea..0165aa222 100644 --- a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java +++ b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java @@ -213,12 +213,12 @@ public class HabitListTest extends BaseUnitTest @Test public void testOrder_inherit() { - habitList.setOrder(BY_COLOR_ASC); + habitList.setOrder(BY_COLOR); HabitList filteredList = habitList.getFiltered(new HabitMatcherBuilder() .setArchivedAllowed(false) .setCompletedAllowed(false) .build()); - assertEquals(filteredList.getOrder(), BY_COLOR_ASC); + assertEquals(filteredList.getOrder(), BY_COLOR); } @Test From 55c50c1119f7118a1fc40ce29e3c712c82b09f04 Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Wed, 18 Nov 2020 06:47:29 -0600 Subject: [PATCH 4/5] Update CHANGELOG --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e976b8d35..ae915a9f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### 1.8.9 (Nov 18, 2020) + +* Remove INTERNET permission +* Manage exceptions for when activities don't exist to handle intents (#181) +* MemoryHabitList: Inherit parent's order (#598) +* Remove notification groups; revert to default system behavior +* Remove SyncManager and Internet permission + ### 1.8.8 (June 21, 2020) * Make small changes to the habit scheduling algorithm, so that "1 time every x days" habits work more predictably. From 83c1ab35d5e5b3c3bf0ab1c658910549cdd32bc1 Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Wed, 18 Nov 2020 06:57:22 -0600 Subject: [PATCH 5/5] GH Actions: Update publish.yml --- .github/workflows/publish.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d52e446ab..bfd0d0eeb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,6 +8,8 @@ on: jobs: build: runs-on: macOS-latest + env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: true steps: - uses: actions/checkout@v1 - name: Install GPG