mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-01 14:45:08 +00:00
Code Issues Releases Wiki Activity

Use Java 8 Date/Time API instead of the legacy API.

Browse Source
This commit is contained in:
Isira Seneviratne
2020-07-01 07:37:53 +05:30
parent 2a4ac97880
commit 03b61f7d1d
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/org/kde/kdeconnect/Helpers/SecurityHelpers/SslHelper.java
View File

@@ -55,8 +55,10 @@ import java.security.PublicKey;
import java.security.cert.Certificate; import java.security.cert.Certificate;
import java.security.cert.CertificateException; import java.security.cert.CertificateException;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import java.time.Instant;
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.Formatter; import java.util.Formatter;
import java.util.Locale; import java.util.Locale;
@@ -126,16 +128,15 @@ public class SslHelper {
nameBuilder.addRDN(BCStyle.CN, deviceId); nameBuilder.addRDN(BCStyle.CN, deviceId);
nameBuilder.addRDN(BCStyle.OU, "KDE Connect"); nameBuilder.addRDN(BCStyle.OU, "KDE Connect");
nameBuilder.addRDN(BCStyle.O, "KDE"); nameBuilder.addRDN(BCStyle.O, "KDE");
Calendar calendar = Calendar.getInstance(); final LocalDate localDate = LocalDate.now().minusYears(1);
calendar.add(Calendar.YEAR, -1); final Instant notBefore = localDate.atStartOfDay(ZoneId.systemDefault()).toInstant();
Date notBefore = calendar.getTime(); final Instant notAfter = localDate.plusYears(10).atStartOfDay(ZoneId.systemDefault())
calendar.add(Calendar.YEAR, 10); .toInstant();
Date notAfter = calendar.getTime();
X509v3CertificateBuilder certificateBuilder = new JcaX509v3CertificateBuilder( X509v3CertificateBuilder certificateBuilder = new JcaX509v3CertificateBuilder(
nameBuilder.build(), nameBuilder.build(),
BigInteger.ONE, BigInteger.ONE,
notBefore, Date.from(notBefore),
notAfter, Date.from(notAfter),
nameBuilder.build(), nameBuilder.build(),
publicKey publicKey
); );

14
src/org/kde/kdeconnect/Plugins/PhotoPlugin/PhotoActivity.java
View File

@@ -5,16 +5,16 @@ import android.net.Uri;
import android.os.Environment; import android.os.Environment;
import android.provider.MediaStore; import android.provider.MediaStore;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.content.FileProvider;
import org.kde.kdeconnect.BackgroundService; import org.kde.kdeconnect.BackgroundService;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.text.SimpleDateFormat; import java.time.LocalDateTime;
import java.util.Date; import java.time.format.DateTimeFormatter;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.content.FileProvider;
public class PhotoActivity extends AppCompatActivity { public class PhotoActivity extends AppCompatActivity {
@@ -45,7 +45,7 @@ public class PhotoActivity extends AppCompatActivity {
private File createImageFile() throws IOException { private File createImageFile() throws IOException {
// Create an image file name // Create an image file name
String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date()); String timeStamp = DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss").format(LocalDateTime.now());
String imageFileName = "JPEG_" + timeStamp + "_"; String imageFileName = "JPEG_" + timeStamp + "_";
File storageDir = getExternalFilesDir(Environment.DIRECTORY_PICTURES); File storageDir = getExternalFilesDir(Environment.DIRECTORY_PICTURES);
return File.createTempFile( return File.createTempFile(