Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity
fedilab-Android-App/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java

786 lines
38 KiB
Java
Raw Normal View History

use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
/* Copyright 2017 Thomas Schneider
*
* This file is a part of Mastalab
*
* This program is free software; you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* Mastalab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with Mastalab; if not,
* see <http://www.gnu.org/licenses>. */
package fr.gouv.etalab.mastodon.activities;
Keep on improving #546
2018-11-03 12:06:44 +01:00
import android.annotation.SuppressLint;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
import android.content.Context;
Fixes issue #174 - Error message for 2FA accounts is unhelpful
2017-12-22 15:36:02 +01:00
import android.content.DialogInterface;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
import android.content.Intent;
import android.content.SharedPreferences;
Login helper
2018-12-11 19:17:14 +01:00
import android.graphics.Color;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
import android.graphics.Paint;
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
import android.net.Uri;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
import android.os.AsyncTask;
import android.os.Bundle;
Improves UX by adding an error message when the instance is empty
2017-12-21 12:28:28 +01:00
import android.support.design.widget.TextInputLayout;
Login helper
2018-12-11 19:17:14 +01:00
import android.support.v4.content.ContextCompat;
Keep on improving #546
2018-11-03 12:06:44 +01:00
import android.support.v7.app.ActionBar;
Fixes issue #174 - Error message for 2FA accounts is unhelpful
2017-12-22 15:36:02 +01:00
import android.support.v7.app.AlertDialog;
Keep on improving #546
2018-11-03 12:06:44 +01:00
import android.support.v7.widget.Toolbar;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
import android.text.Editable;
Fixes issue #174 - Error message for 2FA accounts is unhelpful
2017-12-22 15:36:02 +01:00
import android.text.SpannableString;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
import android.text.TextWatcher;
Fixes issue #174 - Error message for 2FA accounts is unhelpful
2017-12-22 15:36:02 +01:00
import android.text.method.LinkMovementMethod;
import android.text.style.UnderlineSpan;
import android.text.util.Linkify;
Keep on improving #546
2018-11-03 12:06:44 +01:00
import android.view.LayoutInflater;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
Keep on improving #546
2018-11-03 12:06:44 +01:00
import android.view.ViewGroup;
Remote instance follow - step1
2018-08-20 19:00:20 +02:00
import android.widget.AdapterView;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
import android.widget.ArrayAdapter;
import android.widget.AutoCompleteTextView;
import android.widget.Button;
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
import android.widget.CheckBox;
fix names
2019-01-09 18:46:03 +01:00
import android.widget.CompoundButton;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
import android.widget.EditText;
Keep on improving #546
2018-11-03 12:06:44 +01:00
import android.widget.ImageView;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
import android.widget.TextView;
import android.widget.Toast;
improve toast messages
2018-11-25 10:45:16 +01:00
Login helper
2018-12-11 19:17:14 +01:00
import com.elconfidencial.bubbleshowcase.BubbleShowCase;
import com.elconfidencial.bubbleshowcase.BubbleShowCaseBuilder;
import com.elconfidencial.bubbleshowcase.BubbleShowCaseListener;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
improve toast messages
2018-11-25 10:45:16 +01:00
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
import java.io.UnsupportedEncodingException;
Allows url for instance field when log in
2019-01-26 12:45:51 +01:00
import java.net.MalformedURLException;
import java.net.URL;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
import java.net.URLEncoder;
Start moving
2017-11-17 19:44:27 +01:00
import java.util.HashMap;
improve toast messages
2018-11-25 10:45:16 +01:00
import es.dmoral.toasty.Toasty;
Some cleaning and adds previous streaming service if user wants to stop the new one.
2017-11-12 08:33:24 +01:00
import fr.gouv.etalab.mastodon.R;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
import fr.gouv.etalab.mastodon.asynctasks.UpdateAccountInfoAsyncTask;
Changes the API - 1
2017-11-18 08:27:25 +01:00
import fr.gouv.etalab.mastodon.client.HttpsConnection;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
import fr.gouv.etalab.mastodon.helper.Helper;
Keep on improving #546
2018-11-03 12:06:44 +01:00
import static fr.gouv.etalab.mastodon.helper.Helper.THEME_LIGHT;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor;
Fixes issue #174 - Error message for 2FA accounts is unhelpful
2017-12-22 15:36:02 +01:00
import static fr.gouv.etalab.mastodon.helper.Helper.convertDpToPixel;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
/**
* Created by Thomas on 23/04/2017.
* Login activity class which handles the connection
*/
Extends classes
2017-12-12 18:17:01 +01:00
public class LoginActivity extends BaseActivity {
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
private static String client_id;
private static String client_secret;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
private TextView login_two_step;
private static boolean client_id_for_webview = false;
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
private static String instance;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
private AutoCompleteTextView login_instance;
Fixes Issue #28
2017-10-18 09:42:20 +02:00
private EditText login_uid;
private EditText login_passwd;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
boolean isLoadingInstance = false;
Remote instance follow - step1
2018-08-20 19:00:20 +02:00
private String oldSearch;
Login helper
2018-12-11 19:17:14 +01:00
private ImageView info_uid, info_instance, info_pwd, info_2FA;
Add authentication #689
2019-01-02 19:39:40 +01:00
private CheckBox peertube_instance;
private Button connectionButton;
private String actionToken;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Adds conscrypt
2017-12-12 07:28:47 +01:00
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
if( getIntent() != null && getIntent().getData() != null && getIntent().getData().toString().contains("mastalab://backtomastalab?code=")){
String url = getIntent().getData().toString();
String val[] = url.split("code=");
String code = val[1];
final String action = "/oauth/token";
final HashMap<String, String> parameters = new HashMap<>();
parameters.put(Helper.CLIENT_ID, client_id);
parameters.put(Helper.CLIENT_SECRET, client_secret);
parameters.put(Helper.REDIRECT_URI,Helper.REDIRECT_CONTENT_WEB);
parameters.put("grant_type", "authorization_code");
parameters.put("code",code);
new Thread(new Runnable(){
@Override
public void run() {
try {
final String response = new HttpsConnection(LoginActivity.this).post(Helper.instanceWithProtocol(instance) + action, 30, parameters, null);
JSONObject resobj;
try {
resobj = new JSONObject(response);
String token = resobj.get("access_token").toString();
Prepares db for storing information for refreshing the token #699
2019-01-05 12:17:38 +01:00
String refresh_token = null;
if( resobj.has("refresh_token"))
refresh token issue
2019-01-06 15:11:32 +01:00
refresh_token = resobj.get("refresh_token").toString();
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
SharedPreferences.Editor editor = sharedpreferences.edit();
editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, token);
editor.apply();
//Update the account with the token;
Prepares db for storing information for refreshing the token #699
2019-01-05 12:17:38 +01:00
new UpdateAccountInfoAsyncTask(LoginActivity.this, token, client_id, client_secret, refresh_token, instance, peertube_instance.isChecked()?UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE:UpdateAccountInfoAsyncTask.SOCIAL.MASTODON).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
} catch (JSONException ignored) {}
} catch (Exception ignored) {}
}}).start();
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
}else {
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE);
int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
Black theme - Changes main colors
2018-05-11 11:28:05 +02:00
switch (theme){
case Helper.THEME_LIGHT:
setTheme(R.style.AppTheme);
break;
case Helper.THEME_DARK:
setTheme(R.style.AppThemeDark);
break;
case Helper.THEME_BLACK:
setTheme(R.style.AppThemeBlack);
break;
default:
setTheme(R.style.AppThemeDark);
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
}
Black theme - Changes main colors
2018-05-11 11:28:05 +02:00
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
setContentView(R.layout.activity_login);
Keep on improving #546
2018-11-03 12:06:44 +01:00
ActionBar actionBar = getSupportActionBar();
if( actionBar != null ) {
LayoutInflater inflater = (LayoutInflater) this.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
assert inflater != null;
@SuppressLint("InflateParams") View view = inflater.inflate(R.layout.simple_bar, null);
actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
TextView toolbar_title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
toolbar_close.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
}
});
toolbar_title.setText(R.string.add_account);
if (theme == THEME_LIGHT){
Toolbar toolbar = actionBar.getCustomView().findViewById(R.id.toolbar);
Helper.colorizeToolbar(toolbar, R.color.black, LoginActivity.this);
}
}
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
if (theme == Helper.THEME_DARK) {
changeDrawableColor(getApplicationContext(), R.drawable.mastodon_icon, R.color.mastodonC2);
} else {
changeDrawableColor(getApplicationContext(), R.drawable.mastodon_icon, R.color.mastodonC3);
}
Add authentication #689
2019-01-02 19:39:40 +01:00
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
login_instance = findViewById(R.id.login_instance);
login_uid = findViewById(R.id.login_uid);
login_passwd = findViewById(R.id.login_passwd);
Login helper
2018-12-11 19:17:14 +01:00
info_uid = findViewById(R.id.info_uid);
info_instance = findViewById(R.id.info_instance);
info_pwd = findViewById(R.id.info_pwd);
info_2FA = findViewById(R.id.info_2FA);
Add authentication #689
2019-01-02 19:39:40 +01:00
peertube_instance = findViewById(R.id.peertube_instance);
fix names
2019-01-09 18:46:03 +01:00
peertube_instance.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if( isChecked)
login_uid.setHint(R.string.username);
else
login_uid.setHint(R.string.email);
}
});
Add authentication #689
2019-01-02 19:39:40 +01:00
connectionButton = findViewById(R.id.login_button);
Login helper
2018-12-11 19:17:14 +01:00
info_instance.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showcaseInstance(false);
}
});
info_uid.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showCaseLogin(false);
}
});
info_pwd.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showCasePassword(false);
}
});
info_2FA.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showCase2FA(false);
}
});
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
Login helper
2018-12-11 19:17:14 +01:00
showcaseInstance(true);
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
Remote instance follow - step1
2018-08-20 19:00:20 +02:00
login_instance.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick (AdapterView<?> parent, View view, int position, long id) {
oldSearch = parent.getItemAtPosition(position).toString().trim();
}
});
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
login_instance.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
}
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
}
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
@Override
public void afterTextChanged(Editable s) {
if (s.length() > 2 && !isLoadingInstance) {
final String action = "/instances/search";
final HashMap<String, String> parameters = new HashMap<>();
parameters.put("q", s.toString().trim());
Improves replies
2018-08-21 18:50:10 +02:00
parameters.put("count", String.valueOf(1000));
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
parameters.put("name", String.valueOf(true));
isLoadingInstance = true;
Remote instance follow - step1
2018-08-20 19:00:20 +02:00
if( oldSearch == null || !oldSearch.equals(s.toString().trim()))
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
new Thread(new Runnable() {
@Override
public void run() {
try {
final String response = new HttpsConnection(LoginActivity.this).get("https://instances.social/api/1.0" + action, 30, parameters, Helper.THEKINRAR_SECRET_TOKEN);
runOnUiThread(new Runnable() {
public void run() {
isLoadingInstance = false;
String[] instances;
try {
JSONObject jsonObject = new JSONObject(response);
JSONArray jsonArray = jsonObject.getJSONArray("instances");
if (jsonArray != null) {
Remote instance follow - step1
2018-08-20 19:00:20 +02:00
int length = 0;
for (int i = 0; i < jsonArray.length(); i++) {
if( !jsonArray.getJSONObject(i).get("name").toString().contains("@"))
length++;
}
instances = new String[length];
int j = 0;
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
for (int i = 0; i < jsonArray.length(); i++) {
Remote instance follow - step1
2018-08-20 19:00:20 +02:00
if( !jsonArray.getJSONObject(i).get("name").toString().contains("@")) {
instances[j] = jsonArray.getJSONObject(i).get("name").toString();
j++;
}
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
}
} else {
instances = new String[]{};
}
login_instance.setAdapter(null);
ArrayAdapter<String> adapter =
new ArrayAdapter<>(LoginActivity.this, android.R.layout.simple_list_item_1, instances);
login_instance.setAdapter(adapter);
if (login_instance.hasFocus() && !LoginActivity.this.isFinishing())
login_instance.showDropDown();
Remote instance follow - step1
2018-08-20 19:00:20 +02:00
oldSearch = s.toString().trim();
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
} catch (JSONException ignored) {
isLoadingInstance = false;
}
}
});
} catch (HttpsConnection.HttpsConnectionException e) {
isLoadingInstance = false;
} catch (Exception e) {
isLoadingInstance = false;
}
}
}).start();
Improves UX by adding an error message when the instance is empty
2017-12-21 12:28:28 +01:00
}
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
}
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
});
Fixes issue #174 - Error message for 2FA accounts is unhelpful
2017-12-22 15:36:02 +01:00
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
connectionButton.setEnabled(false);
login_two_step = findViewById(R.id.login_two_step);
login_two_step.setVisibility(View.GONE);
Login helper
2018-12-11 19:17:14 +01:00
info_2FA.setVisibility(View.GONE);
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
login_two_step.setPaintFlags(login_two_step.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
login_two_step.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
client_id_for_webview = true;
retrievesClientId();
}
});
Adds link to pick an instance
2018-08-19 14:07:07 +02:00
TextView instances_social = findViewById(R.id.instances_social);
instances_social.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://instances.social"));
startActivity(browserIntent);
}
});
Add authentication #689
2019-01-02 19:39:40 +01:00
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
login_instance.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View v, boolean hasFocus) {
connectionButton.setEnabled(false);
login_two_step.setVisibility(View.INVISIBLE);
Login helper
2018-12-11 19:17:14 +01:00
info_2FA.setVisibility(View.INVISIBLE);
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
TextInputLayout login_instance_layout = findViewById(R.id.login_instance_layout);
if (!hasFocus) {
retrievesClientId();
if (login_instance.getText() == null || login_instance.getText().toString().length() == 0) {
login_instance_layout.setError(getString(R.string.toast_error_instance));
login_instance_layout.setErrorEnabled(true);
}
} else {
login_instance_layout.setErrorEnabled(false);
Fixes issue #174 - Error message for 2FA accounts is unhelpful
2017-12-22 15:36:02 +01:00
}
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
}
});
final TextView login_issue = findViewById(R.id.login_issue);
SpannableString content = new SpannableString(getString(R.string.issue_login_title));
content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
login_issue.setText(content);
login_issue.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Improve alert dialog colors - #546
2018-11-03 14:45:55 +01:00
int style;
if (theme == Helper.THEME_DARK) {
style = R.style.DialogDark;
} else if (theme == Helper.THEME_BLACK){
style = R.style.DialogBlack;
}else {
style = R.style.Dialog;
}
AlertDialog.Builder builder = new AlertDialog.Builder(LoginActivity.this, style);
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
builder.setTitle(R.string.issue_login_title);
TextView message = new TextView(LoginActivity.this);
final SpannableString s =
new SpannableString(getText(R.string.issue_login_message));
Linkify.addLinks(s, Linkify.WEB_URLS);
message.setText(s);
message.setPadding((int) convertDpToPixel(10, LoginActivity.this), (int) convertDpToPixel(10, LoginActivity.this), (int) convertDpToPixel(10, LoginActivity.this), (int) convertDpToPixel(10, LoginActivity.this));
message.setMovementMethod(LinkMovementMethod.getInstance());
builder.setView(message);
builder.setPositiveButton(R.string.close, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
}
});
builder.setIcon(android.R.drawable.ic_dialog_alert).show();
}
});
}
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
}
@Override
protected void onResume(){
super.onResume();
Add authentication #689
2019-01-02 19:39:40 +01:00
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
if (login_instance != null &&login_instance.getText() != null && login_instance.getText().toString().length() > 0 && client_id_for_webview) {
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
connectionButton.setEnabled(false);
client_id_for_webview = false;
retrievesClientId();
}
}
private void retrievesClientId(){
Allows url for instance field when log in
2019-01-26 12:45:51 +01:00
String instanceFromField = login_instance.getText().toString().trim();
String host;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
try {
Allows url for instance field when log in
2019-01-26 12:45:51 +01:00
URL url = new URL(instanceFromField);
host = url.getHost();
} catch (MalformedURLException e) {
e.printStackTrace();
host = instanceFromField;
}
try {
instance = URLEncoder.encode(host, "utf-8");
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
} catch (UnsupportedEncodingException e) {
improve toast messages
2018-11-25 10:45:16 +01:00
Toasty.error(LoginActivity.this,getString(R.string.client_error), Toast.LENGTH_LONG).show();
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
}
Add authentication #689
2019-01-02 19:39:40 +01:00
if( !peertube_instance.isChecked())
actionToken = "/api/v1/apps";
else
actionToken = "/api/v1/oauth-clients/local";
Start moving
2017-11-17 19:44:27 +01:00
final HashMap<String, String> parameters = new HashMap<>();
parameters.put(Helper.CLIENT_NAME, Helper.CLIENT_NAME_VALUE);
parameters.put(Helper.REDIRECT_URIS, client_id_for_webview?Helper.REDIRECT_CONTENT_WEB:Helper.REDIRECT_CONTENT);
Add authentication #689
2019-01-02 19:39:40 +01:00
if( !peertube_instance.isChecked()) {
parameters.put(Helper.SCOPES, Helper.OAUTH_SCOPES);
}else {
parameters.put(Helper.SCOPES, Helper.OAUTH_SCOPES_PEERTUBE);
}
Start moving
2017-11-17 19:44:27 +01:00
parameters.put(Helper.WEBSITE, Helper.WEBSITE_VALUE);
new Thread(new Runnable(){
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
@Override
Start moving
2017-11-17 19:44:27 +01:00
public void run() {
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
try {
Add authentication #689
2019-01-02 19:39:40 +01:00
String response;
if( !peertube_instance.isChecked())
response = new HttpsConnection(LoginActivity.this).post(Helper.instanceWithProtocol(instance) + actionToken, 30, parameters, null );
else
response = new HttpsConnection(LoginActivity.this).get(Helper.instanceWithProtocol(instance) + actionToken, 30, parameters, null );
Start moving
2017-11-17 19:44:27 +01:00
runOnUiThread(new Runnable() {
public void run() {
JSONObject resobj;
try {
resobj = new JSONObject(response);
client_id = resobj.get(Helper.CLIENT_ID).toString();
client_secret = resobj.get(Helper.CLIENT_SECRET).toString();
Add authentication #689
2019-01-02 19:39:40 +01:00
String id = null;
if( !peertube_instance.isChecked())
id = resobj.get(Helper.ID).toString();
Start moving
2017-11-17 19:44:27 +01:00
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
SharedPreferences.Editor editor = sharedpreferences.edit();
editor.putString(Helper.CLIENT_ID, client_id);
editor.putString(Helper.CLIENT_SECRET, client_secret);
editor.putString(Helper.ID, id);
editor.apply();
connectionButton.setEnabled(true);
login_two_step.setVisibility(View.VISIBLE);
Login helper
2018-12-11 19:17:14 +01:00
info_2FA.setVisibility(View.VISIBLE);
showCase2FA(true);
Start moving
2017-11-17 19:44:27 +01:00
if( client_id_for_webview){
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
boolean embedded_browser = sharedpreferences.getBoolean(Helper.SET_EMBEDDED_BROWSER, true);
if( embedded_browser) {
Intent i = new Intent(LoginActivity.this, WebviewConnectActivity.class);
Add authentication #689
2019-01-02 19:39:40 +01:00
i.putExtra("social", peertube_instance.isChecked()?UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE:UpdateAccountInfoAsyncTask.SOCIAL.MASTODON);
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
i.putExtra("instance", instance);
startActivity(i);
}else{
String url = redirectUserToAuthorizeAndLogin(client_id, instance);
Upgrades lib+ fix an issue with custom tabs
2018-02-20 18:18:18 +01:00
Helper.openBrowser(LoginActivity.this, url);
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
}
Start moving
2017-11-17 19:44:27 +01:00
}
Allows onion urls
2018-01-24 15:56:33 +01:00
} catch (JSONException ignored) {ignored.printStackTrace();}
Start moving
2017-11-17 19:44:27 +01:00
}
});
Improves error messages in login page
2018-01-02 12:01:30 +01:00
} catch (final Exception e) {
Allows onion urls
2018-01-24 15:56:33 +01:00
e.printStackTrace();
Improves error messages in login page
2018-01-02 12:01:30 +01:00
runOnUiThread(new Runnable() {
public void run() {
String message;
if( e.getLocalizedMessage() != null && e.getLocalizedMessage().trim().length() > 0)
message = e.getLocalizedMessage();
else if (e.getMessage() != null && e.getMessage().trim().length() > 0)
message = e.getMessage();
else
message = getString(R.string.client_error);
improve toast messages
2018-11-25 10:45:16 +01:00
Toasty.error(getApplicationContext(), message,Toast.LENGTH_LONG).show();
Improves error messages in login page
2018-01-02 12:01:30 +01:00
}
});
}
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
}
Start moving
2017-11-17 19:44:27 +01:00
}).start();
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
connectionButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
connectionButton.setEnabled(false);
if( client_id_for_webview ){
client_id_for_webview = false;
retrievesClientId();
return;
}
Start moving
2017-11-17 19:44:27 +01:00
final HashMap<String, String> parameters = new HashMap<>();
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
Start moving
2017-11-17 19:44:27 +01:00
parameters.put(Helper.CLIENT_ID, sharedpreferences.getString(Helper.CLIENT_ID, null));
parameters.put(Helper.CLIENT_SECRET, sharedpreferences.getString(Helper.CLIENT_SECRET, null));
parameters.put("grant_type", "password");
Fix email issue with special chars
2017-12-21 13:29:51 +01:00
try {
Fix issue #618 - case insensitive for emails
2018-12-08 13:51:10 +01:00
parameters.put("username",URLEncoder.encode(login_uid.getText().toString().trim().toLowerCase(), "UTF-8"));
Fix email issue with special chars
2017-12-21 13:29:51 +01:00
} catch (UnsupportedEncodingException e) {
Fix issue #618 - case insensitive for emails
2018-12-08 13:51:10 +01:00
parameters.put("username",login_uid.getText().toString().trim().toLowerCase());
Fix email issue with special chars
2017-12-21 13:29:51 +01:00
}
Fixes issue with encoding
2017-11-27 08:02:18 +01:00
try {
parameters.put("password",URLEncoder.encode(login_passwd.getText().toString(), "UTF-8"));
} catch (UnsupportedEncodingException e) {
parameters.put("password",login_passwd.getText().toString());
}
Add authentication #689
2019-01-02 19:39:40 +01:00
String oauthUrl;
if( !peertube_instance.isChecked()) {
parameters.put("scope", " read write follow");
oauthUrl = "/oauth/token";
}else {
parameters.put("scope", "user");
oauthUrl = "/api/v1/users/token";
}
Start moving
2017-11-17 19:44:27 +01:00
new Thread(new Runnable(){
@Override
public void run() {
try {
Add authentication #689
2019-01-02 19:39:40 +01:00
final String response = new HttpsConnection(LoginActivity.this).post(Helper.instanceWithProtocol(instance) + oauthUrl, 30, parameters, null );
Start moving
2017-11-17 19:44:27 +01:00
runOnUiThread(new Runnable() {
public void run() {
JSONObject resobj;
try {
resobj = new JSONObject(response);
String token = resobj.get("access_token").toString();
Prepares db for storing information for refreshing the token #699
2019-01-05 12:17:38 +01:00
String refresh_token = null;
if( resobj.has("refresh_token"))
refresh token issue
2019-01-06 15:11:32 +01:00
refresh_token = resobj.get("refresh_token").toString();
Start moving
2017-11-17 19:44:27 +01:00
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
SharedPreferences.Editor editor = sharedpreferences.edit();
editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, token);
editor.apply();
//Update the account with the token;
Prepares db for storing information for refreshing the token #699
2019-01-05 12:17:38 +01:00
new UpdateAccountInfoAsyncTask(LoginActivity.this, token, client_id, client_secret, refresh_token, instance, peertube_instance.isChecked()?UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE:UpdateAccountInfoAsyncTask.SOCIAL.MASTODON).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
Fixes live notifications and some issues with Tor onion URLs
2018-01-24 16:27:52 +01:00
} catch (JSONException ignored) {ignored.printStackTrace();}
Start moving
2017-11-17 19:44:27 +01:00
}
});
Improves error messages in login page
2018-01-02 12:01:30 +01:00
}catch (final Exception e) {
Fixes live notifications and some issues with Tor onion URLs
2018-01-24 16:27:52 +01:00
e.printStackTrace();
Removes mentions to the lib
2017-11-18 18:39:19 +01:00
runOnUiThread(new Runnable() {
public void run() {
connectionButton.setEnabled(true);
Improves error messages in login page
2018-01-02 12:01:30 +01:00
runOnUiThread(new Runnable() {
public void run() {
String message;
if( e.getLocalizedMessage() != null && e.getLocalizedMessage().trim().length() > 0)
message = e.getLocalizedMessage();
else if (e.getMessage() != null && e.getMessage().trim().length() > 0)
message = e.getMessage();
else
message = getString(R.string.client_error);
improve toast messages
2018-11-25 10:45:16 +01:00
Toasty.error(getApplicationContext(), message,Toast.LENGTH_LONG).show();
Improves error messages in login page
2018-01-02 12:01:30 +01:00
}
});
Removes mentions to the lib
2017-11-18 18:39:19 +01:00
}
});
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
}
Start moving
2017-11-17 19:44:27 +01:00
}
}).start();
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
}
});
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.main_login, menu);
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
CheckBox checkBox= (CheckBox) menu.findItem(R.id.action_custom_tabs).getActionView();
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE);
boolean embedded_browser = sharedpreferences.getBoolean(Helper.SET_EMBEDDED_BROWSER, true);
checkBox.setChecked(!embedded_browser);
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();
//noinspection SimplifiableIfStatement
if (id == R.id.action_about) {
Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
startActivity(intent);
}else if(id == R.id.action_privacy){
Intent intent = new Intent(getApplicationContext(), PrivacyActivity.class);
startActivity(intent);
Allows to define the proxy
2018-01-20 09:46:28 +01:00
}else if(id == R.id.action_proxy){
Intent intent = new Intent(getApplicationContext(), ProxyActivity.class);
startActivity(intent);
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
}else if(id == R.id.action_custom_tabs){
item.setChecked(!item.isChecked());
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE);
SharedPreferences.Editor editor = sharedpreferences.edit();
editor.putBoolean(Helper.SET_EMBEDDED_BROWSER, !item.isChecked());
editor.apply();
return false;
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
}
return super.onOptionsItemSelected(item);
}
Adds custom tabs for login activity #321
2018-02-16 15:15:04 +01:00
public static String redirectUserToAuthorizeAndLogin(String clientId, String instance) {
String queryString = Helper.CLIENT_ID + "="+ clientId;
queryString += "&" + Helper.REDIRECT_URI + "="+ Uri.encode(Helper.REDIRECT_CONTENT_WEB);
queryString += "&" + Helper.RESPONSE_TYPE +"=code";
queryString += "&" + Helper.SCOPE +"=" + Helper.OAUTH_SCOPES;
return Helper.instanceWithProtocol(instance) + Helper.EP_AUTHORIZE + "?" + queryString;
}
Login helper
2018-12-11 19:17:14 +01:00
private void showcaseInstance(final boolean loop){
BubbleShowCaseBuilder showCaseBuilder = new BubbleShowCaseBuilder(LoginActivity.this)
.title(getString(R.string.instance))
.description(getString(R.string.showcase_instance))
.arrowPosition(BubbleShowCase.ArrowPosition.TOP)
.backgroundColor(ContextCompat.getColor(LoginActivity.this, R.color.mastodonC4))
.textColor(Color.WHITE)
.titleTextSize(17)
.descriptionTextSize(15);
if( loop)
showCaseBuilder.showOnce("BUBBLE_SHOW_CASE_INSTANCE_ID");
showCaseBuilder.listener(new BubbleShowCaseListener (){
@Override
public void onTargetClick(BubbleShowCase bubbleShowCase) {
if( loop) {
bubbleShowCase.finishSequence();
showCaseLogin(true);
}
}
@Override
public void onCloseActionImageClick(BubbleShowCase bubbleShowCase) {
if(loop) {
bubbleShowCase.finishSequence();
showCaseLogin(true);
}
}
@Override
public void onBubbleClick(BubbleShowCase bubbleShowCase) {
}
@Override
public void onBackgroundDimClick(BubbleShowCase bubbleShowCase) {
}
})
.targetView(login_instance)
.show();
}
private void showCaseLogin(final boolean loop){
BubbleShowCaseBuilder showCaseBuilder = new BubbleShowCaseBuilder(LoginActivity.this) //Activity instance
.title(getString(R.string.login))
.description(getString(R.string.showcase_uid))
.arrowPosition(BubbleShowCase.ArrowPosition.TOP)
.backgroundColor(ContextCompat.getColor(LoginActivity.this, R.color.mastodonC4))
.textColor(Color.WHITE)
.titleTextSize(17)
.descriptionTextSize(15);
if( loop)
showCaseBuilder.showOnce("BUBBLE_SHOW_CASE_UID_ID");
showCaseBuilder.listener(new BubbleShowCaseListener (){
@Override
public void onTargetClick(BubbleShowCase bubbleShowCase) {
if( loop) {
bubbleShowCase.finishSequence();
showCasePassword(true);
}
}
@Override
public void onCloseActionImageClick(BubbleShowCase bubbleShowCase) {
if( loop) {
bubbleShowCase.finishSequence();
showCasePassword(true);
}
}
@Override
public void onBubbleClick(BubbleShowCase bubbleShowCase) {
}
@Override
public void onBackgroundDimClick(BubbleShowCase bubbleShowCase) {
}
})
.targetView(login_uid)
.show();
}
private void showCasePassword(boolean loop){
BubbleShowCaseBuilder showCaseBuilder = new BubbleShowCaseBuilder(LoginActivity.this)
.title(getString(R.string.password))
.description(getString(R.string.showcase_pwd))
.arrowPosition(BubbleShowCase.ArrowPosition.BOTTOM)
.backgroundColor(ContextCompat.getColor(LoginActivity.this, R.color.mastodonC4))
.textColor(Color.WHITE)
.titleTextSize(17)
.descriptionTextSize(15);
if( loop)
showCaseBuilder.showOnce("BUBBLE_SHOW_CASE_PASSWORD_ID");
showCaseBuilder.listener(new BubbleShowCaseListener (){
@Override
public void onTargetClick(BubbleShowCase bubbleShowCase) {
}
@Override
public void onCloseActionImageClick(BubbleShowCase bubbleShowCase) {
}
@Override
public void onBubbleClick(BubbleShowCase bubbleShowCase) {
}
@Override
public void onBackgroundDimClick(BubbleShowCase bubbleShowCase) {
}
})
.targetView(login_passwd)
.show();
}
private void showCase2FA(boolean loop){
BubbleShowCaseBuilder showCaseBuilder = new BubbleShowCaseBuilder(LoginActivity.this)
.title(getString(R.string.two_factor_authentification))
.description(getString(R.string.showcase_2FA))
.arrowPosition(BubbleShowCase.ArrowPosition.BOTTOM)
.backgroundColor(ContextCompat.getColor(LoginActivity.this, R.color.mastodonC4))
.textColor(Color.WHITE)
.titleTextSize(17)
.descriptionTextSize(15);
if( loop)
showCaseBuilder.showOnce("BUBBLE_SHOW_CASE_2FA_ID");
showCaseBuilder.listener(new BubbleShowCaseListener (){
@Override
public void onTargetClick(BubbleShowCase bubbleShowCase) {
}
@Override
public void onCloseActionImageClick(BubbleShowCase bubbleShowCase) {
}
@Override
public void onBubbleClick(BubbleShowCase bubbleShowCase) {
}
@Override
public void onBackgroundDimClick(BubbleShowCase bubbleShowCase) {
}
})
Release 1.40.0
2018-12-11 19:38:22 +01:00
.targetView(login_two_step)
Login helper
2018-12-11 19:17:14 +01:00
.show();
}
use base classes for login and main activity, fixes #27
2017-10-17 13:13:35 +02:00
}