Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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
9 changes: 8 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,15 @@ dependencies {

implementation "io.github.rburgst:okhttp-digest:$versions.okhttp_digest"

// Git sync over SSH
implementation "org.eclipse.jgit:org.eclipse.jgit:$versions.jgit"
implementation "org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:$versions.jgit"
implementation("org.eclipse.jgit:org.eclipse.jgit.ssh.apache:$versions.jgit") {
// Resolves DuplicatePlatformClasses lint error
exclude group: 'org.apache.sshd', module: 'sshd-osgi'
}
implementation 'androidx.security:security-crypto:1.1.0-alpha03'
implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha04'

}

repositories {
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@
android:windowSoftInputMode="stateAlwaysHidden|adjustResize">
</activity>

<activity
android:name=".android.ui.SshKeygenActivity"
android:windowSoftInputMode="stateAlwaysHidden">
</activity>

<activity
android:name=".android.ui.repo.webdav.WebdavRepoActivity"
android:windowSoftInputMode="stateAlwaysHidden|adjustResize">
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/com/orgzly/android/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,7 @@ public static Context getAppContext() {
public static void setCurrentActivity(CommonActivity currentCommonActivity) {
currentActivity = currentCommonActivity;
}

public static CommonActivity getCurrentActivity() { return currentActivity; }

}
4 changes: 4 additions & 0 deletions app/src/main/java/com/orgzly/android/AppIntent.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ public class AppIntent {

public static final String ACTION_SHOW_SNACKBAR = "com.orgzly.intent.action.SHOW_SNACKBAR";

public static final String ACTION_REJECT_REMOTE_HOST_KEY = "com.orgzly.intent.action.REJECT_REMOTE_HOST_KEY";
public static final String ACTION_ACCEPT_REMOTE_HOST_KEY = "com.orgzly.intent.action.ACCEPT_REMOTE_HOST_KEY";
public static final String ACTION_ACCEPT_AND_STORE_REMOTE_HOST_KEY = "com.orgzly.intent.action.ACCEPT_AND_STORE_REMOTE_HOST_KEY";

public static final String EXTRA_MESSAGE = "com.orgzly.intent.extra.MESSAGE";
public static final String EXTRA_BOOK_ID = "com.orgzly.intent.extra.BOOK_ID";
public static final String EXTRA_BOOK_PREFACE = "com.orgzly.intent.extra.BOOK_PREFACE";
Expand Down
23 changes: 23 additions & 0 deletions app/src/main/java/com/orgzly/android/NotificationChannels.kt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ object NotificationChannels {
const val REMINDERS = "reminders"
const val SYNC_PROGRESS = "sync-progress"
const val SYNC_FAILED = "sync-failed"
const val SYNC_PROMPT = "sync-prompt"

@JvmStatic
fun createAll(context: Context) {
Expand All @@ -28,6 +29,7 @@ object NotificationChannels {
createForReminders(context)
createForSyncProgress(context)
createForSyncFailed(context)
createForSyncPrompt(context)
}
}

Expand Down Expand Up @@ -111,4 +113,25 @@ object NotificationChannels {

context.getNotificationManager().createNotificationChannel(channel)
}

@RequiresApi(Build.VERSION_CODES.O)
private fun createForSyncPrompt(context: Context) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
return
}

val id = SYNC_PROMPT
val name = "Sync prompt"
val description = "Display sync prompt"
val importance = NotificationManager.IMPORTANCE_HIGH

val channel = NotificationChannel(id, name, importance)

channel.description = description

channel.setShowBadge(false)

val mNotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
mNotificationManager.createNotificationChannel(channel)
}
}
Loading