Skip to content

Commit

Permalink
Merge pull request #747 from CypherpunkArmory/master
Browse files Browse the repository at this point in the history
Upgrade to v2.5.3.
  • Loading branch information
MatthewTighe authored Apr 3, 2019
2 parents a2722ab + 2300250 commit 0dc015c
Show file tree
Hide file tree
Showing 41 changed files with 1,988 additions and 644 deletions.
20 changes: 15 additions & 5 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,28 @@ title: 'Bug report - [YOUR BUG TITLE]'

---

How to use this template:
Any line that begins with '#' is a **header**. Please leave the headers in as is, and fill in the information they suggest
below them. These templates are here to help us resolve your issue as quickly as possible. Leaving requested information out
of your issue will cause our issue template bot to request that your post be reformatted. If a header doesn't seem relevant
to your issue, either write 'N/A' or something similar below the header or consider using a different template.

# Describe the bug

A clear and concise description of what the bug is, and what expected behavior is. Include whether the bug occurs **before**
or **after** entering a terminal or vnc client session.

# Steps to reproduce the behavior:

Go to '...'
A list of **exact** steps to reproduce the behavior. If we cannot follow the steps to recreate the issue, we won't be able
to help you.

For example:
1. Go to '...'

Click on '....'
2. Click on '....'

Scroll down to '....'
3. Scroll down to '....'

# Screenshots

Expand All @@ -30,6 +40,6 @@ UserLAnd Version [e.g. 0.1.2].
Whether the device is rooted.
Whether the device is running LineageOS

# Additional context

Add any other context about the problem here.

Please add any other context you think might help us resolve your issue.
9 changes: 7 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ title: 'Feature Request - [YOUR FEATURE REQUEST]'

---

How to use this template:
Any line that begins with '#' is a **header**. Please leave the headers in as is, and fill in the information they suggest
below them. These templates are here to help us resolve your issue as quickly as possible. Leaving requested information out
of your issue will cause our issue template bot to request that your post be reformatted. If a header doesn't seem relevant
to your issue, either write 'N/A' or something similar below the header or consider using a different template.

# Describe the problem your feature request solves.
A clear and concise description of what the problem is.

Expand All @@ -16,5 +22,4 @@ A clear and concise description of what you want to happen.
# Describe alternatives you've considered
A clear and concise description of any alternative solutions or features you've considered.

# Additional context
Add any other context or screenshots about the feature request here.
Please add any other context or screenshots you think might help us resolve your issue.
8 changes: 7 additions & 1 deletion .github/ISSUE_TEMPLATE/help.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ assignees: ''

---

How to use this template:
Any line that begins with '#' is a **header**. Please leave the headers in as is, and fill in the information they suggest
below them. These templates are here to help us resolve your issue as quickly as possible. Leaving requested information out
of your issue will cause our issue template bot to request that your post be reformatted. If a header doesn't seem relevant
to your issue, either write 'N/A' or something similar below the header or consider using a different template.

# Describe the issue you are having.

This should include things like:
Expand All @@ -15,4 +21,4 @@ This should include things like:

# Describe how your task behaves in a regular Linux environment

Describe how the task you are trying to accomplish behaves in a regular Linux environment, if applicable.
Describe how the task you are trying to accomplish behaves in a regular Linux environment.
11 changes: 9 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ android {
applicationId "tech.ula"
minSdkVersion 21
targetSdkVersion 28
versionCode 53
versionName "2.4.0"
versionCode 57
versionName "2.5.3"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
Expand Down Expand Up @@ -173,6 +173,8 @@ task jacocoCoverageReportForCi(type: JacocoReport, dependsOn: ['testDebugUnitTes

dependencies {
def acra_version = '5.2.1'
def moshi_version = '1.8.0'
def okhttp_version = '3.13.1'

implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':terminal-term')
Expand All @@ -192,12 +194,17 @@ dependencies {
implementation "com.android.support:preference-v7:$support_library_version"
ktlint "com.github.shyiko:ktlint:0.29.0"
implementation "ch.acra:acra-http:$acra_version"
implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
implementation "com.squareup.moshi:moshi:$moshi_version"
kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version"
implementation 'org.rauschig:jarchivelib:0.8.0' // v1.0.0 breaks all sdk versions < 26 https://github.com/thrau/jarchivelib/issues/75

testImplementation 'junit:junit:4.12'
testImplementation "org.mockito:mockito-core:$mockito_version"
testImplementation "org.mockito:mockito-inline:$mockito_version"
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockito_kotlin_version"
testImplementation "android.arch.core:core-testing:$core_testing_version"
testImplementation "com.squareup.okhttp3:mockwebserver:$okhttp_version"
androidTestImplementation "android.arch.core:core-testing:$core_testing_version"
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espresso_version"
androidTestImplementation "com.android.support.test.espresso:espresso-intents:$espresso_version"
Expand Down
2 changes: 1 addition & 1 deletion app/release/output.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":49,"versionName":"2.3.5","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":56,"versionName":"2.5.2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
265 changes: 265 additions & 0 deletions app/schemas/tech.ula.model.repositories.UlaDatabase/7.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,265 @@
{
"formatVersion": 1,
"database": {
"version": 7,
"identityHash": "c16e59797ccf2b41f4f05a5e3e285b1e",
"entities": [
{
"tableName": "session",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `filesystemId` INTEGER NOT NULL, `filesystemName` TEXT NOT NULL, `active` INTEGER NOT NULL, `username` TEXT NOT NULL, `password` TEXT NOT NULL, `vncPassword` TEXT NOT NULL, `serviceType` TEXT NOT NULL, `port` INTEGER NOT NULL, `pid` INTEGER NOT NULL, `geometry` TEXT NOT NULL, `isAppsSession` INTEGER NOT NULL, FOREIGN KEY(`filesystemId`) REFERENCES `filesystem`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "filesystemId",
"columnName": "filesystemId",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "filesystemName",
"columnName": "filesystemName",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "active",
"columnName": "active",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "username",
"columnName": "username",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "password",
"columnName": "password",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "vncPassword",
"columnName": "vncPassword",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "serviceType",
"columnName": "serviceType",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "port",
"columnName": "port",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "pid",
"columnName": "pid",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "geometry",
"columnName": "geometry",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "isAppsSession",
"columnName": "isAppsSession",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"id"
],
"autoGenerate": true
},
"indices": [
{
"name": "index_session_filesystemId",
"unique": false,
"columnNames": [
"filesystemId"
],
"createSql": "CREATE INDEX `index_session_filesystemId` ON `${TABLE_NAME}` (`filesystemId`)"
}
],
"foreignKeys": [
{
"table": "filesystem",
"onDelete": "CASCADE",
"onUpdate": "NO ACTION",
"columns": [
"filesystemId"
],
"referencedColumns": [
"id"
]
}
]
},
{
"tableName": "filesystem",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `distributionType` TEXT NOT NULL, `archType` TEXT NOT NULL, `defaultUsername` TEXT NOT NULL, `defaultPassword` TEXT NOT NULL, `defaultVncPassword` TEXT NOT NULL, `isAppsFilesystem` INTEGER NOT NULL, `versionCodeUsed` TEXT NOT NULL, `isCreatedFromBackup` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "distributionType",
"columnName": "distributionType",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "archType",
"columnName": "archType",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "defaultUsername",
"columnName": "defaultUsername",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "defaultPassword",
"columnName": "defaultPassword",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "defaultVncPassword",
"columnName": "defaultVncPassword",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "isAppsFilesystem",
"columnName": "isAppsFilesystem",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "versionCodeUsed",
"columnName": "versionCodeUsed",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "isCreatedFromBackup",
"columnName": "isCreatedFromBackup",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"id"
],
"autoGenerate": true
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "apps",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `category` TEXT NOT NULL, `filesystemRequired` TEXT NOT NULL, `supportsCli` INTEGER NOT NULL, `supportsGui` INTEGER NOT NULL, `isPaidApp` INTEGER NOT NULL, `version` INTEGER NOT NULL, PRIMARY KEY(`name`))",
"fields": [
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "category",
"columnName": "category",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "filesystemRequired",
"columnName": "filesystemRequired",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "supportsCli",
"columnName": "supportsCli",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "supportsGui",
"columnName": "supportsGui",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "isPaidApp",
"columnName": "isPaidApp",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "version",
"columnName": "version",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"name"
],
"autoGenerate": false
},
"indices": [
{
"name": "index_apps_name",
"unique": true,
"columnNames": [
"name"
],
"createSql": "CREATE UNIQUE INDEX `index_apps_name` ON `${TABLE_NAME}` (`name`)"
}
],
"foreignKeys": []
}
],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"c16e59797ccf2b41f4f05a5e3e285b1e\")"
]
}
}
Loading

0 comments on commit 0dc015c

Please sign in to comment.