Updating references to oxen-io

pull/1706/head
ThomasSession 5 months ago
parent 536824b0e0
commit b33148a4ed

@ -6,9 +6,9 @@ body:
- type: checkboxes - type: checkboxes
attributes: attributes:
label: Code of conduct label: Code of conduct
description: I have read and agree to adhere to the [Code of Conduct](https://github.com/oxen-io/session-android/blob/master/CODE_OF_CONDUCT.md). description: I have read and agree to adhere to the [Code of Conduct](https://github.com/session-foundation/session-android/blob/master/CODE_OF_CONDUCT.md).
options: options:
- label: I have read and agree to adhere to the [Code of Conduct](https://github.com/oxen-io/session-android/blob/master/CODE_OF_CONDUCT.md) - label: I have read and agree to adhere to the [Code of Conduct](https://github.com/session-foundation/session-android/blob/master/CODE_OF_CONDUCT.md)
required: true required: true
- type: checkboxes - type: checkboxes

2
.gitmodules vendored

@ -1,3 +1,3 @@
[submodule "libsession-util/libsession-util"] [submodule "libsession-util/libsession-util"]
path = libsession-util/libsession-util path = libsession-util/libsession-util
url = https://github.com/oxen-io/libsession-util.git url = https://github.com/session-foundation/libsession-util.git

@ -28,7 +28,7 @@ Setting up a development environment and building from Android Studio
1. Open Android Studio. On a new installation, the Quickstart panel will appear. If you have open projects, close them using "File > Close Project" to see the Quickstart panel. 1. Open Android Studio. On a new installation, the Quickstart panel will appear. If you have open projects, close them using "File > Close Project" to see the Quickstart panel.
2. From the Quickstart panel, choose "Checkout from Version Control" then "git". 2. From the Quickstart panel, choose "Checkout from Version Control" then "git".
3. Paste the URL for the session-android project when prompted (https://github.com/oxen-io/session-android.git). 3. Paste the URL for the session-android project when prompted (https://github.com/session-foundation/session-android.git).
4. Android Studio should detect the presence of a project file and ask you whether to open it. Click "yes". 4. Android Studio should detect the presence of a project file and ask you whether to open it. Click "yes".
5. Default config options should be good enough. 5. Default config options should be good enough.
6. Project initialization and building should proceed. 6. Project initialization and building should proceed.

@ -4,7 +4,7 @@
Add the [F-Droid repo](https://fdroid.getsession.org/) Add the [F-Droid repo](https://fdroid.getsession.org/)
[Download the APK from here](https://github.com/oxen-io/session-android/releases/latest) [Download the APK from here](https://github.com/session-foundation/session-android/releases/latest)
## Summary ## Summary
@ -14,7 +14,7 @@ Session integrates directly with [Oxen Service Nodes](https://docs.oxen.io/about
## Want to contribute? Found a bug or have a feature request? ## Want to contribute? Found a bug or have a feature request?
Please search for any [existing issues](https://github.com/oxen-io/session-android/issues) that describe your bugs in order to avoid duplicate submissions. Submissions can be made by making a pull request to our `dev` branch. If you don't know where to start contributing, try reading the Github issues page for ideas. Please search for any [existing issues](https://github.com/session-foundation/session-android/issues) that describe your bugs in order to avoid duplicate submissions. Submissions can be made by making a pull request to our `dev` branch. If you don't know where to start contributing, try reading the Github issues page for ideas.
## Build instructions ## Build instructions
@ -39,7 +39,7 @@ Get the signed hash for this release. `SESSION_VERSION` needs to be updated for
``` ```
export SESSION_VERSION=1.10.4 export SESSION_VERSION=1.10.4
wget https://github.com/oxen-io/session-android/releases/download/$SESSION_VERSION/signatures.asc wget https://github.com/session-foundation/session-android/releases/download/$SESSION_VERSION/signatures.asc
``` ```
**Step 3:** **Step 3:**

@ -170,7 +170,7 @@ android {
website { website {
dimension "distribution" dimension "distribution"
ext.websiteUpdateUrl = "https://github.com/oxen-io/session-android/releases" ext.websiteUpdateUrl = "https://github.com/session-foundation/session-android/releases"
buildConfigField "boolean", "PLAY_STORE_DISABLED", "true" buildConfigField "boolean", "PLAY_STORE_DISABLED", "true"
buildConfigField "org.session.libsession.utilities.Device", "DEVICE", "org.session.libsession.utilities.Device.ANDROID" buildConfigField "org.session.libsession.utilities.Device", "DEVICE", "org.session.libsession.utilities.Device.ANDROID"
buildConfigField "String", "NOPLAY_UPDATE_URL", "\"$ext.websiteUpdateUrl\"" buildConfigField "String", "NOPLAY_UPDATE_URL", "\"$ext.websiteUpdateUrl\""
@ -332,7 +332,7 @@ dependencies {
implementation project(":libsession") implementation project(":libsession")
implementation project(":libsession-util") implementation project(":libsession-util")
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxJsonVersion" implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxJsonVersion"
implementation "com.github.oxen-io.session-android-curve-25519:curve25519-java:$curve25519Version" implementation "com.github.session-foundation.session-android-curve-25519:curve25519-java:$curve25519Version"
implementation project(":liblazysodium") implementation project(":liblazysodium")
implementation "net.java.dev.jna:jna:5.12.1@aar" implementation "net.java.dev.jna:jna:5.12.1@aar"
implementation "com.google.protobuf:protobuf-java:$protobufVersion" implementation "com.google.protobuf:protobuf-java:$protobufVersion"

@ -137,7 +137,7 @@ class SaveAttachmentTask @JvmOverloads constructor(context: Context, count: Int
// TODO: This method may pass an empty string as the filename in Android API 28 and below. This requires // TODO: This method may pass an empty string as the filename in Android API 28 and below. This requires
// TODO: follow-up investigation, but has temporarily been worked around, see: // TODO: follow-up investigation, but has temporarily been worked around, see:
// TODO: https://github.com/oxen-io/session-android/commit/afbb71351a74220c312a09c25cc1c79738453c12 // TODO: https://github.com/session-foundation/session-android/commit/afbb71351a74220c312a09c25cc1c79738453c12
val fileParts: Array<String> = getFileNameParts(fileName) val fileParts: Array<String> = getFileNameParts(fileName)
val base = fileParts[0] val base = fileParts[0]

@ -64,7 +64,7 @@ dependencies {
implementation 'com.makeramen:roundedimageview:2.1.0' implementation 'com.makeramen:roundedimageview:2.1.0'
implementation 'com.esotericsoftware:kryo:5.1.1' implementation 'com.esotericsoftware:kryo:5.1.1'
implementation "com.fasterxml.jackson.core:jackson-databind:$jacksonDatabindVersion" implementation "com.fasterxml.jackson.core:jackson-databind:$jacksonDatabindVersion"
implementation "com.github.oxen-io.session-android-curve-25519:curve25519-java:$curve25519Version" implementation "com.github.session-foundation.session-android-curve-25519:curve25519-java:$curve25519Version"
implementation "com.squareup.okhttp3:okhttp:$okhttpVersion" implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
implementation "com.squareup.phrase:phrase:$phraseVersion" implementation "com.squareup.phrase:phrase:$phraseVersion"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"

@ -119,7 +119,7 @@ object FileServerApi {
* Note that the value is cached and can be up to 30 minutes out of date normally, and up to 24 * Note that the value is cached and can be up to 30 minutes out of date normally, and up to 24
* hours out of date if we cannot reach the Github API for some reason. * hours out of date if we cannot reach the Github API for some reason.
* *
* https://github.com/oxen-io/session-file-server/blob/dev/doc/api.yaml#L119 * https://github.com/session-foundation/session-file-server/blob/dev/doc/api.yaml#L119
*/ */
suspend fun getClientVersion(): VersionData { suspend fun getClientVersion(): VersionData {
// Generate the auth signature // Generate the auth signature

@ -23,7 +23,7 @@ dependencies {
implementation "androidx.annotation:annotation:1.5.0" implementation "androidx.annotation:annotation:1.5.0"
implementation "com.google.protobuf:protobuf-java:$protobufVersion" implementation "com.google.protobuf:protobuf-java:$protobufVersion"
implementation "com.fasterxml.jackson.core:jackson-databind:$jacksonDatabindVersion" implementation "com.fasterxml.jackson.core:jackson-databind:$jacksonDatabindVersion"
implementation "com.github.oxen-io.session-android-curve-25519:curve25519-java:$curve25519Version" implementation "com.github.session-foundation.session-android-curve-25519:curve25519-java:$curve25519Version"
implementation "com.squareup.okhttp3:okhttp:$okhttpVersion" implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"

Loading…
Cancel
Save