mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-27 08:55:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

refactor PushUtils

Browse source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2022-01-17 11:18:35 +01:00
parent 01b0452d6f
commit 31f2f40bcf
No known key found for this signature in database
GPG key ID: C793F8B59F43CE7B
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/com/nextcloud/talk/utils/PushUtils.java
View file

@ -85,21 +85,17 @@ public class PushUtils {
@Inject
NcApi ncApi;
private File keysFile;
private File publicKeyFile;
private File privateKeyFile;
private final File publicKeyFile;
private final File privateKeyFile;
private String proxyServer;
private final String proxyServer;
public PushUtils() {
NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this);
keysFile = NextcloudTalkApplication.Companion.getSharedApplication().getDir("PushKeyStore", Context.MODE_PRIVATE);
publicKeyFile = new File(NextcloudTalkApplication.Companion.getSharedApplication().getDir("PushKeystore",
Context.MODE_PRIVATE), "push_key.pub");
privateKeyFile = new File(NextcloudTalkApplication.Companion.getSharedApplication().getDir("PushKeystore",
Context.MODE_PRIVATE), "push_key.priv");
String keyPath = NextcloudTalkApplication.Companion.getSharedApplication().getDir("PushKeystore", Context.MODE_PRIVATE).getAbsolutePath();
publicKeyFile = new File(keyPath, "push_key.pub");
privateKeyFile = new File(keyPath, "push_key.priv");
proxyServer = NextcloudTalkApplication.Companion.getSharedApplication().getResources().
getString(R.string.nc_push_server_url);
}
@ -190,9 +186,6 @@ public class PushUtils {
public int generateRsa2048KeyPair() {
if (!publicKeyFile.exists() && !privateKeyFile.exists()) {
if (!keysFile.exists()) {
keysFile.mkdirs();
}
KeyPairGenerator keyGen = null;
try {
@ -226,7 +219,6 @@ public class PushUtils {
String token = appPreferences.getPushToken();
if (!TextUtils.isEmpty(token)) {
String credentials;
String pushTokenHash = generateSHA512Hash(token).toLowerCase();
PublicKey devicePublicKey = (PublicKey) readKeyFromFile(true);
if (devicePublicKey != null) {