Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

Update buildin api key

This commit is contained in:
Tlaster 2020-04-14 14:31:07 +08:00
parent 34dfa0126c
commit b1b9fd6026
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
twidere.component.common/src/main/java/org/mariotaku/twidere/TwidereConstants.java
View File

@ -64,10 +64,10 @@ public interface TwidereConstants extends SharedPreferenceConstants, IntentConst
String ETAG_MASTODON_APPS_PREFERENCES_NAME = "mastodon_apps";
String ACCOUNT_PREFERENCES_NAME_PREFIX = "account_preferences_";
String TWITTER_CONSUMER_KEY = "0WEJk1x6AlgtjGRhyABXw";
String TWITTER_CONSUMER_SECRET = "gWXNqEFhO3fMkAqoIKpTdjK0MOJs68xnOky0FRdDTP8";
String TWITTER_CONSUMER_KEY = "wmtrtTaVOjUnH5pWQp4LDI5Qs";
String TWITTER_CONSUMER_SECRET = "E9Q9u2yK0COJae2tLcNEdY75OPA3bxqJiGZQztraHaQUtoI2cu";
String DEFAULT_TWITTER_API_URL_FORMAT = "https://[DOMAIN.]twitter.com/";
String DEFAULT_TWITTER_API_URL_FORMAT = "https://[DOMAIN].twitter.com/";
String SCHEME_HTTP = "http";
String SCHEME_HTTPS = "https";

6
twidere/src/main/assets/data/default_api_configs.json
View File

@ -3,12 +3,12 @@
"name": "Twidere",
"type": "twitter",
"localized_name": "@string/provider_default",
"api_url_format": "https://[DOMAIN.]twitter.com/",
"api_url_format": "https://[DOMAIN].twitter.com/",
"auth_type": "oauth",
"same_oauth_url": true,
"no_version_suffix": false,
"consumer_key": "i5XtSVfoWjLjKlnrvhiLPMZC0",
"consumer_secret": "sQncmZ2atQR6tKbqnnAtqjrECqN8k6FD4p4OoNS0XTDkUz3HGH",
"consumer_key": "wmtrtTaVOjUnH5pWQp4LDI5Qs",
"consumer_secret": "E9Q9u2yK0COJae2tLcNEdY75OPA3bxqJiGZQztraHaQUtoI2cu",
"sign_up_url": "https://twitter.com/signup"
},
{

2
twidere/src/main/java/org/mariotaku/twidere/util/MicroBlogAPIFactory.java
View File

@ -125,7 +125,7 @@ public class MicroBlogAPIFactory implements TwidereConstants {
// Not an url
if (idxOfSlash < 0) return format;
final int startOfHost = idxOfSlash + 3;
if (startOfHost < 0) return getApiBaseUrl("https://[DOMAIN.]twitter.com/", domain);
if (startOfHost < 0) return getApiBaseUrl(DEFAULT_TWITTER_API_URL_FORMAT, domain);
final int endOfHost = format.indexOf('/', startOfHost);
final String host = endOfHost != -1 ? format.substring(startOfHost, endOfHost) : format.substring(startOfHost);
final StringBuilder sb = new StringBuilder();

1
twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt
View File

@ -1188,7 +1188,6 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher,
private val FRAGMENT_TAG_SIGN_IN_PROGRESS = "sign_in_progress"
private val EXTRA_API_LAST_CHANGE = "api_last_change"
private val DEFAULT_TWITTER_API_URL_FORMAT = "https://[DOMAIN.]twitter.com/"
@Throws(IOException::class)
internal fun detectAccountType(twitter: MicroBlog, user: User, type: String?): Pair<String, AccountExtras?> {