Browse Source

sending authorization header and other small fixes

azivner 6 years ago
parent
commit
ffee8dde98

+ 4 - 1
app/src/main/java/io/github/zadam/triliumsender/LoginActivity.kt

@@ -20,6 +20,7 @@ import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.ArrayAdapter
 import android.widget.TextView
+import android.widget.Toast
 import kotlinx.android.synthetic.main.activity_login.*
 import okhttp3.*
 import org.json.JSONObject
@@ -200,7 +201,7 @@ class LoginActivity : AppCompatActivity(), LoaderCallbacks<Cursor> {
 
             val body = RequestBody.create(JSON, json.toString())
             val request = Request.Builder()
-                    .url(mTriliumAddress + "/api/login/token")
+                    .url(mTriliumAddress + "/api/sender/login")
                     .post(body)
                     .build()
 
@@ -249,6 +250,8 @@ class LoginActivity : AppCompatActivity(), LoaderCallbacks<Cursor> {
                 editor.putString(MainActivity.PREF_TOKEN, loginResult.token);
                 editor.apply()
 
+                Toast.makeText(this@LoginActivity, "Trilium connection settings have been successfully configured.", Toast.LENGTH_LONG).show()
+
                 finish()
             } else {
                 if (loginResult.errorCode == R.string.error_network_error

+ 3 - 4
app/src/main/java/io/github/zadam/triliumsender/ShareActivity.kt

@@ -61,15 +61,14 @@ class ShareActivity : AppCompatActivity() {
 
             val request = Request.Builder()
                     .url(triliumAddress + "/api/sender/image")
+                    .addHeader("Authorization", token)
                     .post(requestBody)
                     .build()
 
             try {
-                client.newCall(request).execute()
+                val response = client.newCall(request).execute()
 
-                // FIXME check status code
-
-                return true;
+                return response.code() == 200
             }
             catch (e: Exception) {
                 Log.e(TAG, "Sending to Trilium failed", e)