mirror of
https://github.com/nuclearfog/Shitter.git
synced 2025-01-31 11:25:03 +01:00
moved Twitter Tokens class to v1 package
This commit is contained in:
parent
4439b3db9c
commit
2c41bb8a3d
@ -1,4 +1,4 @@
|
||||
package org.nuclearfog.twidda.backend.api.twitter;
|
||||
package org.nuclearfog.twidda.backend.api.twitter.v1;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
@ -52,7 +52,7 @@ public class Tokens {
|
||||
*
|
||||
* @return instance of this class
|
||||
*/
|
||||
public static Tokens getInstance(Context context) {
|
||||
static Tokens getInstance(Context context) {
|
||||
if (instance == null)
|
||||
instance = new Tokens(context);
|
||||
return instance;
|
||||
@ -64,7 +64,7 @@ public class Tokens {
|
||||
* @param forceDefault use default API key
|
||||
* @return consumer API key
|
||||
*/
|
||||
public String getConsumerKey(boolean forceDefault) {
|
||||
String getConsumerKey(boolean forceDefault) {
|
||||
Account login = settings.getLogin();
|
||||
if (login.usingDefaultTokens() || forceDefault)
|
||||
return CONSUMER_TOKEN;
|
||||
@ -77,7 +77,7 @@ public class Tokens {
|
||||
* @param forceDefault use default API key
|
||||
* @return consumer secret API key
|
||||
*/
|
||||
public String getConsumerSecret(boolean forceDefault) {
|
||||
String getConsumerSecret(boolean forceDefault) {
|
||||
Account login = settings.getLogin();
|
||||
if (login.usingDefaultTokens() || forceDefault)
|
||||
return TOKEN_SECRET;
|
@ -11,7 +11,6 @@ import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
import org.nuclearfog.twidda.BuildConfig;
|
||||
import org.nuclearfog.twidda.backend.api.Connection;
|
||||
import org.nuclearfog.twidda.backend.api.twitter.Tokens;
|
||||
import org.nuclearfog.twidda.backend.api.twitter.TwitterException;
|
||||
import org.nuclearfog.twidda.backend.api.twitter.v1.impl.AccountV1;
|
||||
import org.nuclearfog.twidda.backend.api.twitter.v1.impl.LocationV1;
|
||||
|
@ -33,7 +33,7 @@ import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.appcompat.widget.Toolbar;
|
||||
|
||||
import org.nuclearfog.twidda.R;
|
||||
import org.nuclearfog.twidda.backend.api.twitter.Tokens;
|
||||
import org.nuclearfog.twidda.backend.api.twitter.v1.Tokens;
|
||||
import org.nuclearfog.twidda.backend.async.AsyncExecutor.AsyncCallback;
|
||||
import org.nuclearfog.twidda.backend.async.LoginAction;
|
||||
import org.nuclearfog.twidda.backend.async.LoginAction.LoginParam;
|
||||
|
@ -18,7 +18,7 @@ import android.widget.TextView;
|
||||
import com.kyleduo.switchbutton.SwitchButton;
|
||||
|
||||
import org.nuclearfog.twidda.R;
|
||||
import org.nuclearfog.twidda.backend.api.twitter.Tokens;
|
||||
import org.nuclearfog.twidda.backend.api.twitter.v1.Tokens;
|
||||
import org.nuclearfog.twidda.backend.helper.ConnectionConfig;
|
||||
import org.nuclearfog.twidda.backend.utils.AppStyles;
|
||||
import org.nuclearfog.twidda.config.Configuration;
|
||||
|
Loading…
x
Reference in New Issue
Block a user