msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Updated AndroidX

Browse Source
pull/214/head
M66B 2 years ago
parent 8b546434cf
commit 29206ec723
9 changed files with 35 additions and 49 deletions
Show Stats Download Patch File Download Diff File

20
app/build.gradle
Unescape View File

@ -434,7 +434,7 @@ configurations.all {
} else if (details.requested.group == "androidx.lifecycle" &&
details.requested.name != "lifecycle-extensions") {
//print("Pinning " + details.requested.group + ":" + details.requested.name + "\n")
details.useVersion "2.6.1"
details.useVersion "2.6.2"
} else if (details.requested.group == "org.apache.poi") {
//print("Pinning " + details.requested.group + ":" + details.requested.name + "\n")
details.useVersion "3.17"
@ -453,14 +453,14 @@ dependencies {
def startup_version = "1.1.1" // 1.2.0-alpha02
def annotation_version_experimental = "1.3.1"
def core_version = "1.10.1" // 1.12.0-rc01
def core_version = "1.12.0"
def appcompat_version = "1.6.1" // 1.7.0-alpha03
def emoji_version = "1.4.0"
def flatbuffers_version = "2.0.0"
def activity_version = "1.7.2" // 1.8.0-alpha07
def fragment_version = "1.6.1" // 1.7.0-alpha03
def windows_version = "1.2.0-beta01"
def webkit_version = "1.7.0" // 1.8.0-rc01
def activity_version = "1.7.2" // 1.8.0-rc01
def fragment_version = "1.6.1" // 1.7.0-alpha05
def windows_version = "1.2.0-beta03"
def webkit_version = "1.8.0"
def recyclerview_version = "1.3.1"
def coordinatorlayout_version = "1.2.0"
def constraintlayout_version = "2.1.4" // 2.2.0-alpha12
@ -469,14 +469,14 @@ dependencies {
def lbm_version = "1.1.0"
def swiperefresh_version = "1.2.0-alpha01"
def documentfile_version = "1.1.0-alpha01"
def lifecycle_version = "2.6.1" // 2.7.0-alpha01
def lifecycle_version = "2.6.2"
def lifecycle_extensions_version = "2.2.0"
def room_version = "2.4.3" // 2.5.2/2.6.0-beta01
def sqlite_version = "2.3.1" // 2.4.0-beta01
def room_version = "2.4.3" // 2.5.2/2.6.0-rc01
def sqlite_version = "2.3.1" // 2.4.0-rc01
def requery_version = "3.39.2"
def paging_version = "2.1.2" // 3.2.0
def preference_version = "1.2.1"
def work_version = "2.8.1" // 2.9.0-alpha02
def work_version = "2.8.1" // 2.9.0-beta01
def exif_version = "1.3.6"
def biometric_version = "1.2.0-alpha05"
def billingclient_version = "6.0.1"

5
app/src/main/java/eu/faircode/email/ActivityError.java
Unescape View File

@ -21,12 +21,13 @@ package eu.faircode.email;
import android.content.Intent;
import android.os.Bundle;
import android.text.method.LinkMovementMethod;
import android.view.View;
import android.widget.Button;
import android.widget.ImageButton;
import android.widget.TextView;
import androidx.core.text.method.LinkMovementMethodCompat;
public class ActivityError extends ActivityBase {
static final int PI_ERROR = 1;
static final int PI_ALERT = 2;
@ -76,7 +77,7 @@ public class ActivityError extends ActivityBase {
int faq = intent.getIntExtra("faq", -1);
tvTitle.setText(title);
tvMessage.setMovementMethod(LinkMovementMethod.getInstance());
tvMessage.setMovementMethod(LinkMovementMethodCompat.getInstance());
tvMessage.setText(message);
boolean password = (auth_type == ServiceAuthenticator.AUTH_TYPE_PASSWORD);

6
app/src/main/java/eu/faircode/email/AdapterMessage.java
Unescape View File

@ -67,7 +67,6 @@ import android.text.Spanned;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.text.method.ArrowKeyMovementMethod;
import android.text.method.LinkMovementMethod;
import android.text.method.MovementMethod;
import android.text.style.DynamicDrawableSpan;
import android.text.style.ForegroundColorSpan;
@ -121,6 +120,7 @@ import androidx.core.content.ContextCompat;
import androidx.core.content.FileProvider;
import androidx.core.content.pm.ShortcutInfoCompat;
import androidx.core.graphics.ColorUtils;
import androidx.core.text.method.LinkMovementMethodCompat;
import androidx.core.view.MenuCompat;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
@ -852,7 +852,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
tvKeywordsEx = vsBody.findViewById(R.id.tvKeywordsEx);
tvHeaders = vsBody.findViewById(R.id.tvHeaders);
tvHeaders.setMovementMethod(LinkMovementMethod.getInstance());
tvHeaders.setMovementMethod(LinkMovementMethodCompat.getInstance());
ibCopyHeaders = vsBody.findViewById(R.id.ibCopyHeaders);
ibCloseHeaders = vsBody.findViewById(R.id.ibCloseHeaders);
pbHeaders = vsBody.findViewById(R.id.pbHeaders);
@ -3506,7 +3506,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
onCopy();
break;
default:
raction.getActionIntent().send();
raction.getActionIntent().send(); // PendingIntentCompat.send()
}
} catch (Throwable ex) {
Log.e(ex);

4
app/src/main/java/eu/faircode/email/FragmentAccount.java
Unescape View File

@ -38,7 +38,6 @@ import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.text.method.LinkMovementMethod;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@ -61,6 +60,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.PopupMenu;
import androidx.constraintlayout.widget.Group;
import androidx.core.text.method.LinkMovementMethodCompat;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Lifecycle;
@ -645,7 +645,7 @@ public class FragmentAccount extends FragmentBase {
btnHelp.setVisibility(View.GONE);
btnSupport.setVisibility(View.GONE);
tvInstructions.setVisibility(View.GONE);
tvInstructions.setMovementMethod(LinkMovementMethod.getInstance());
tvInstructions.setMovementMethod(LinkMovementMethodCompat.getInstance());
grpServer.setVisibility(View.GONE);
grpAuthorize.setVisibility(View.GONE);

4
app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java
Unescape View File

@ -23,7 +23,6 @@ import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
import android.text.Spanned;
import android.text.method.LinkMovementMethod;
import android.view.LayoutInflater;
import android.view.View;
import android.view.WindowManager;
@ -33,6 +32,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.Group;
import androidx.core.text.method.LinkMovementMethodCompat;
import java.io.InputStream;
@ -105,7 +105,7 @@ public class FragmentDialogMarkdown extends FragmentDialogBase {
@Override
protected void onExecuted(Bundle args, Spanned markdown) {
tvMarkdown.setText(markdown);
tvMarkdown.setMovementMethod(LinkMovementMethod.getInstance());
tvMarkdown.setMovementMethod(LinkMovementMethodCompat.getInstance());
}
@Override

6
app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
Unescape View File

@ -44,7 +44,6 @@ import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.text.method.LinkMovementMethod;
import android.text.style.ForegroundColorSpan;
import android.text.style.StyleSpan;
import android.util.Pair;
@ -71,6 +70,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.constraintlayout.widget.Group;
import androidx.core.content.ContextCompat;
import androidx.core.net.MailTo;
import androidx.core.text.method.LinkMovementMethodCompat;
import androidx.core.util.PatternsCompat;
import androidx.lifecycle.Lifecycle;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@ -432,7 +432,7 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
}
});
tvOwnerRemark.setMovementMethod(LinkMovementMethod.getInstance());
tvOwnerRemark.setMovementMethod(LinkMovementMethodCompat.getInstance());
btnWhois.setOnClickListener(new View.OnClickListener() {
@Override
@ -470,7 +470,7 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
final TextView tvWhois = dview.findViewById(R.id.tvWhois);
final ImageButton ibInfo = dview.findViewById(R.id.ibInfo);
tvWhois.setMovementMethod(LinkMovementMethod.getInstance());
tvWhois.setMovementMethod(LinkMovementMethodCompat.getInstance());
ibInfo.setOnClickListener(new View.OnClickListener() {
@Override

4
app/src/main/java/eu/faircode/email/FragmentIdentity.java
Unescape View File

@ -38,7 +38,6 @@ import android.provider.ContactsContract;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.text.method.LinkMovementMethod;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@ -62,6 +61,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.PopupMenu;
import androidx.constraintlayout.widget.Group;
import androidx.core.text.method.LinkMovementMethodCompat;
import androidx.lifecycle.Lifecycle;
import androidx.preference.PreferenceManager;
@ -247,7 +247,7 @@ public class FragmentIdentity extends FragmentBase {
btnHelp = view.findViewById(R.id.btnHelp);
btnSupport = view.findViewById(R.id.btnSupport);
tvInstructions = view.findViewById(R.id.tvInstructions);
tvInstructions.setMovementMethod(LinkMovementMethod.getInstance());
tvInstructions.setMovementMethod(LinkMovementMethodCompat.getInstance());
pbWait = view.findViewById(R.id.pbWait);

4
app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
Unescape View File

@ -32,7 +32,6 @@ import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.text.method.LinkMovementMethod;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
@ -48,6 +47,7 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.Group;
import androidx.core.text.method.LinkMovementMethodCompat;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.Lifecycle;
@ -273,7 +273,7 @@ public class FragmentQuickSetup extends FragmentBase {
tvArgument.setVisibility(View.GONE);
tvErrorHint.setVisibility(View.GONE);
tvInstructions.setVisibility(View.GONE);
tvInstructions.setMovementMethod(LinkMovementMethod.getInstance());
tvInstructions.setMovementMethod(LinkMovementMethodCompat.getInstance());
btnHelp.setVisibility(View.GONE);
cbUpdate.setChecked(update);
cbUpdate.setVisibility(View.GONE);

21
app/src/main/java/eu/faircode/email/Helper.java
Unescape View File

@ -96,7 +96,6 @@ import android.view.ViewParent;
import android.view.Window;
import android.view.accessibility.AccessibilityManager;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import android.webkit.MimeTypeMap;
import android.webkit.WebView;
import android.widget.Button;
@ -119,6 +118,7 @@ import androidx.browser.customtabs.CustomTabsIntent;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.content.ContextCompat;
import androidx.core.content.FileProvider;
import androidx.core.view.SoftwareKeyboardControllerCompat;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.fragment.app.Fragment;
@ -1979,33 +1979,18 @@ public class Helper {
}
static void showKeyboard(final View view) {
final Context context = view.getContext();
InputMethodManager imm = Helper.getSystemService(context, InputMethodManager.class);
if (imm == null)
return;
view.postDelayed(new Runnable() {
@Override
public void run() {
try {
Log.i("showKeyboard view=" + view);
imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
new SoftwareKeyboardControllerCompat(view).show();
} catch (Throwable ex) {
Log.e(ex);
}
}
}, 250);
}
static void hideKeyboard(final View view) {
final Context context = view.getContext();
InputMethodManager imm = Helper.getSystemService(context, InputMethodManager.class);
if (imm == null)
return;
try {
Log.i("hideKeyboard view=" + view);
imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
new SoftwareKeyboardControllerCompat(view).hide();
} catch (Throwable ex) {
Log.e(ex);
}

Write Preview
Loading…
Cancel
Save