Pipeline

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,3 +8,9 @@ assignees: ''
 ---
 
 - I have searched for existing issues that may be the same as or related to mine.
+
+Please complete the following information:
+
+    Device: 
+    Android Version: 
+    Orgzly Revived Version: 

.github/workflows/android-build-master.yml

@@ -8,6 +8,9 @@ on:
     branches:
       - 'master'
 
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
 jobs:
   build:
     name: Generate APK
@@ -24,6 +27,8 @@ jobs:
 
       - name: Build APK
         run: ./gradlew assembleDebug
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload APK
         uses: actions/upload-artifact@v2

.github/workflows/prerelease.yml

@@ -25,9 +25,18 @@ jobs:
           distribution: 'zulu'
           java-version: '11'
 
+      - name: Setup build tool version variable
+        shell: bash
+        run: |
+          BUILD_TOOL_VERSION=$(ls /usr/local/lib/android/sdk/build-tools/ | tail -n 1)
+          echo "BUILD_TOOL_VERSION=$BUILD_TOOL_VERSION" >> $GITHUB_ENV
+          echo Last build tool version is: $BUILD_TOOL_VERSION
+
       # Build the standard version binary.
       - name: Generate "premium" release APK
         run: ./gradlew assemblePremiumRelease --stacktrace
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Sign APK using key store from repo secrets
         uses: r0adkll/sign-android-release@v1
@@ -37,6 +46,8 @@ jobs:
           signingKeyBase64: ${{ secrets.APK_SIGNING_KEYSTORE_FILE }}
           alias: orgzly-revived-20231013
           keyStorePassword: ${{ secrets.APK_SIGNING_KEYSTORE_PASSWORD }}
+        env:
+          BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
 
       - name: Get version name from git tag
         run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
@@ -47,6 +58,8 @@ jobs:
       # Now do the same for the F-Droid flavor.
       - name: Generate "fdroid" release APK
         run: ./gradlew assembleFdroidRelease --stacktrace
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Sign APK using key store from repo secrets
         uses: r0adkll/sign-android-release@v1
@@ -56,6 +69,8 @@ jobs:
           signingKeyBase64: ${{ secrets.APK_SIGNING_KEYSTORE_FILE }}
           alias: orgzly-revived-20231013
           keyStorePassword: ${{ secrets.APK_SIGNING_KEYSTORE_PASSWORD }}
+        env:
+          BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
 
       - name: Rename APK file
         run: mv ${{steps.sign_fdroid_apk.outputs.signedReleaseFile}} orgzly-revived-fdroid-${{ env.VERSION }}.apk

.github/workflows/release.yml

@@ -26,9 +26,18 @@ jobs:
           distribution: 'zulu'
           java-version: '11'
 
+      - name: Setup build tool version variable
+        shell: bash
+        run: |
+          BUILD_TOOL_VERSION=$(ls /usr/local/lib/android/sdk/build-tools/ | tail -n 1)
+          echo "BUILD_TOOL_VERSION=$BUILD_TOOL_VERSION" >> $GITHUB_ENV
+          echo Last build tool version is: $BUILD_TOOL_VERSION
+
       # Build the standard version binary.
       - name: Generate "premium" release APK
         run: ./gradlew assemblePremiumRelease --stacktrace
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Sign APK using key store from repo secrets
         uses: r0adkll/sign-android-release@v1
@@ -38,6 +47,8 @@ jobs:
           signingKeyBase64: ${{ secrets.APK_SIGNING_KEYSTORE_FILE }}
           alias: orgzly-revived-20231013
           keyStorePassword: ${{ secrets.APK_SIGNING_KEYSTORE_PASSWORD }}
+        env:
+          BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
 
       - name: Get version name from git tag
         run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
@@ -48,6 +59,8 @@ jobs:
       # Now do the same for the F-Droid flavor.
       - name: Generate "fdroid" release APK
         run: ./gradlew assembleFdroidRelease --stacktrace
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Sign APK using key store from repo secrets
         uses: r0adkll/sign-android-release@v1
@@ -57,6 +70,8 @@ jobs:
           signingKeyBase64: ${{ secrets.APK_SIGNING_KEYSTORE_FILE }}
           alias: orgzly-revived-20231013
           keyStorePassword: ${{ secrets.APK_SIGNING_KEYSTORE_PASSWORD }}
+        env:
+          BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
 
       - name: Rename APK file
         run: mv ${{steps.sign_fdroid_apk.outputs.signedReleaseFile}} orgzly-revived-fdroid-${{ env.VERSION }}.apk
@@ -67,4 +82,3 @@ jobs:
         with:
           files: 'orgzly-revived-*.apk'
           draft: true
-

.github/workflows/test.yaml

@@ -0,0 +1,56 @@
+name: Test
+
+on:
+  pull_request:
+    branches:
+      - 'master'
+  push:
+    branches:
+      - 'master'
+  workflow_dispatch: 
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Gradle cache
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: AVD cache
+        uses: actions/cache@v4
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-29
+
+      - name: create AVD and generate snapshot for caching
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 29
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          profile: Nexus 6
+          script: echo "Generated AVD snapshot for caching."
+
+      - name: run tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 29
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          profile: Nexus 6
+          script: ./gradlew connectedCheck

README.org

@@ -3,11 +3,6 @@
 <a title="Build" target="_blank" href="https://github.com/orgzly-revived/orgzly-android-revived/actions/workflows/android-build-master.yml"><img src="https://github.com/orgzly-revived/orgzly-android-revived/actions/workflows/android-build-master.yml/badge.svg"></a>
 <a title="Crowdin" target="_blank" href="https://crowdin.com/project/orgzly"><img src="https://d322cqt584bo4o.cloudfront.net/orgzly/localized.svg"></a>
 </div>
-<a href="https://apt.izzysoft.de/fdroid/index/apk/com.orgzlyrevived">
-    <img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png"
-    alt="Get it on IzzyOnDroid"
-    height="80">
-</a>
 <a href="https://f-droid.org/packages/com.orgzlyrevived">
     <img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
     alt="Get it on F-Droid"
@@ -58,6 +53,8 @@ We generally plan to leave existing open issues in the original
 [[https://github.com/orgzly/orgzly-android][repository]] and reference them here as 
 they are addressed.
 
+There is also a Matrix chat room where anyone is welcome to join: #orgzly:matrix.org.
+
 * License
 
 The project is licensed under the [[https://github.com/orgzly-revived/orgzly-android-revived/blob/master/LICENSE][GNU General Public License version 3 (or newer)]].

app/build.gradle

@@ -2,25 +2,26 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
-
 android {
     namespace 'com.orgzly'
 
-    compileSdkVersion 32
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 21 // Lollipop (5.0)
         targetSdkVersion 32 // Android 12L
-        applicationId "com.orgzlyrevived"
-        versionCode 183
-        versionName "1.8.14"
+        versionCode 197
+        versionName "1.8.19-beta.1"
+        applicationId = "com.orgzlyrevived"
+        resValue "string", "application_id", "com.orgzlyrevived"
 
         testInstrumentationRunner "com.orgzly.android.OrgzlyTestRunner"
         // testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         multiDexEnabled true
 
         buildConfigField "String", "DROPBOX_APP_KEY", gradle.ext.appProperties.getProperty("dropbox.app_key", '""')
+
         resValue "string", "dropbox_app_key_schema", gradle.ext.appProperties.getProperty("dropbox.app_key_schema", '')
 
         javaCompileOptions {
@@ -183,24 +184,26 @@ dependencies {
         exclude group: 'xpp3', module: 'xpp3'
     }
 
-    constraints {
-        implementation('com.squareup.okhttp3:okhttp:4.10.0-RC1') {
-            because 'https://github.com/orgzly/orgzly-android/issues/880'
-        }
+    implementation('com.squareup.okhttp3:okhttp:4.10.0-RC1') {
+        because 'https://github.com/orgzly/orgzly-android/issues/880'
     }
 
     implementation "io.github.rburgst:okhttp-digest:$versions.okhttp_digest"
 
-    // Git sync via SSH
-    implementation "org.eclipse.jgit:org.eclipse.jgit:$versions.jgit"
-    implementation "org.eclipse.jgit:org.eclipse.jgit.ssh.apache:$versions.jgit"
+    implementation("org.eclipse.jgit:org.eclipse.jgit:$versions.jgit") {
+        because 'Git repo support'
+    }
+    implementation("org.eclipse.jgit:org.eclipse.jgit.ssh.apache:$versions.jgit") {
+        because 'SSH transport support for Git repos'
+        // Avoid DuplicatePlatformClasses error:
+        exclude group: 'org.apache.sshd', module: 'sshd-sftp'
+    }
     implementation("androidx.security:security-crypto:$versions.security_crypto") {
         because 'SSH key generation'
     }
     implementation("androidx.biometric:biometric-ktx:$versions.biometric_ktx") {
         because 'Protect SSH key with biometric prompt'
     }
-
 }
 
 repositories {
@@ -216,7 +219,7 @@ def orgJavaLocation() {
         logger.info("app: Using org-java from ${gradle.ext.orgJavaDir}")
         return project(':org-java')
     } else {
-        logger.info("app: Using com.orgzly:org-java:$versions.org_java from Maven repository")
-        return "com.orgzly:org-java:$versions.org_java"
+        logger.info("app: Using com.github.orgzly-revived:org-java:$versions.org_java from Maven repository")
+        return "com.github.orgzly-revived:org-java:$versions.org_java"
     }
 }

app/proguard-rules.pro

@@ -47,6 +47,7 @@
 
 -dontwarn org.joda.convert.**
 
+-dontwarn org.eclipse.jgit.**
 -dontwarn com.jcraft.**
 -dontwarn org.slf4j.**
 

app/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="28" />
+        android:maxSdkVersion="29" />
 
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
 
@@ -34,7 +34,6 @@
         android:supportsRtl="true"
         android:icon="@mipmap/cic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppLightTheme.Light"
         android:fullBackupContent="@xml/backup_config"
         android:requestLegacyExternalStorage="true">
 
@@ -228,6 +227,10 @@
 
         <receiver android:name=".android.NewNoteBroadcastReceiver"/>
 
+        <receiver android:name=".android.external.ExternalAccessReceiver"
+            android:exported="true">
+        </receiver>
+
         <receiver android:name=".android.TimeChangeBroadcastReceiver" android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.TIME_SET"/>

app/src/main/java/com/orgzly/android/data/DataRepository.kt

@@ -613,7 +613,7 @@ class DataRepository @Inject constructor(
 
         } else {
             db.runInTransaction(Callable {
-                moveSubtrees(noteIds, Place.UNDER, target.noteId)
+                moveSubtrees(noteIds, target.place, target.noteId)
             })
         }
     }
@@ -1280,6 +1280,22 @@ class DataRepository @Inject constructor(
         return db.note().getNoteAndAncestors(noteId)
     }
 
+    fun getNoteAtPath(fullPath: String): NoteView? {
+        val (bookName, path) = run {
+            val pathParts = fullPath.split("/")
+            if (pathParts.isEmpty()) return null
+            pathParts[0] to pathParts.drop(1).joinToString("/")
+        }
+        return if (path.split("/").any { it.isNotEmpty() })
+            getNotes(bookName)
+                    .filter { ("/$path").endsWith("/" + it.note.title) }
+                    .firstOrNull { view ->
+                        getNoteAndAncestors(view.note.id)
+                                .joinToString("/") { it.title } == path
+                    }
+        else null
+    }
+
     fun getNotesAndSubtrees(ids: Set<Long>): List<Note> {
         return db.note().getNotesForSubtrees(ids)
     }

app/src/main/java/com/orgzly/android/data/logs/AppLogsRepository.kt

@@ -5,5 +5,5 @@ import kotlinx.coroutines.flow.Flow
 interface AppLogsRepository {
     fun log(type: String, str: String)
 
-    fun getFlow(type: String): Flow<List<LogEntry>>
+    fun getFlow(): Flow<List<LogEntry>>
 }

app/src/main/java/com/orgzly/android/data/logs/DatabaseAppLogsRepository.kt

@@ -18,8 +18,8 @@ class DatabaseAppLogsRepository @Inject constructor(db: OrgzlyDatabase) : AppLog
         dbAppLog.insert(entry)
     }
 
-    override fun getFlow(type: String): Flow<List<LogEntry>> {
-        return dbAppLog.getFlow(type).map { logEntries ->
+    override fun getFlow(): Flow<List<LogEntry>> {
+        return dbAppLog.getFlow().map { logEntries ->
             logEntries.map { entry ->
                 LogEntry(entry.timestamp, entry.name, entry.message)
             }

app/src/main/java/com/orgzly/android/db/dao/AppLogDao.kt

@@ -7,6 +7,6 @@ import kotlinx.coroutines.flow.Flow
 
 @Dao
 abstract class AppLogDao : BaseDao<AppLog> {
-    @Query("SELECT * FROM app_logs WHERE name = :name ORDER BY timestamp")
-    abstract fun getFlow(name: String): Flow<List<AppLog>>
+    @Query("SELECT * FROM app_logs ORDER BY timestamp")
+    abstract fun getFlow(): Flow<List<AppLog>>
 }

app/src/main/java/com/orgzly/android/di/AppComponent.kt

@@ -7,6 +7,7 @@ import com.orgzly.android.TimeChangeBroadcastReceiver
 import com.orgzly.android.di.module.ApplicationModule
 import com.orgzly.android.di.module.DataModule
 import com.orgzly.android.di.module.DatabaseModule
+import com.orgzly.android.external.actionhandlers.ExternalAccessActionHandler
 import com.orgzly.android.reminders.NoteReminders
 import com.orgzly.android.reminders.RemindersBroadcastReceiver
 import com.orgzly.android.sync.SyncWorker
@@ -86,4 +87,5 @@ interface AppComponent {
     fun inject(arg: RemindersBroadcastReceiver)
     fun inject(arg: NotificationBroadcastReceiver)
     fun inject(arg: SharingShortcutsManager)
+    fun inject(arg: ExternalAccessActionHandler)
 }