浏览代码

make all utils methods static

AndyScherzinger 6 年之前
父节点
当前提交
994d73f529

+ 1 - 1
src/generic/java/com/owncloud/android/utils/PushUtils.java

@@ -47,7 +47,7 @@ public final class PushUtils {
         return null;
     }
 
-    public SignatureVerification verifySignature(Context context, byte[] signatureBytes, byte[] subjectBytes) {
+    public static SignatureVerification verifySignature(Context context, byte[] signatureBytes, byte[] subjectBytes) {
         return null;
     }
 

+ 2 - 5
src/gplay/java/com/owncloud/android/utils/PushUtils.java

@@ -403,7 +403,7 @@ public final class PushUtils {
         }
     }
 
-    public SignatureVerification verifySignature(Context context, byte[] signatureBytes, byte[] subjectBytes) {
+    public static SignatureVerification verifySignature(Context context, byte[] signatureBytes, byte[] subjectBytes) {
         Signature signature = null;
         PublicKey publicKey;
         SignatureVerification signatureVerification = new SignatureVerification();
@@ -416,7 +416,6 @@ public final class PushUtils {
         Gson gson = new Gson();
         PushConfigurationState pushArbitraryData;
 
-
         try {
             signature = Signature.getInstance("SHA512withRSA");
             if (accounts.length > 0) {
@@ -447,7 +446,7 @@ public final class PushUtils {
         return signatureVerification;
     }
 
-    private Key readKeyFromString(boolean readPublicKey, String keyString) {
+    private static Key readKeyFromString(boolean readPublicKey, String keyString) {
         String modifiedKey;
         if (readPublicKey) {
             modifiedKey = keyString.replaceAll("\\n", "").replace("-----BEGIN PUBLIC KEY-----",
@@ -467,7 +466,6 @@ public final class PushUtils {
                 PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(Base64.decode(modifiedKey, Base64.DEFAULT));
                 return keyFactory.generatePrivate(keySpec);
             }
-
         } catch (NoSuchAlgorithmException e) {
             Log.d("TAG", "No such algorithm while reading key from string");
         } catch (InvalidKeySpecException e) {
@@ -476,5 +474,4 @@ public final class PushUtils {
 
         return null;
     }
-
 }

+ 1 - 2
src/main/java/com/owncloud/android/jobs/NotificationJob.java

@@ -71,11 +71,10 @@ public class NotificationJob extends Job {
             try {
                 byte[] base64DecodedSubject = Base64.decode(subject, Base64.DEFAULT);
                 byte[] base64DecodedSignature = Base64.decode(signature, Base64.DEFAULT);
-                PushUtils pushUtils = new PushUtils();
                 PrivateKey privateKey = (PrivateKey) PushUtils.readKeyFromFile(false);
 
                 try {
-                    SignatureVerification signatureVerification = pushUtils.verifySignature(context,
+                    SignatureVerification signatureVerification = PushUtils.verifySignature(context,
                             base64DecodedSignature, base64DecodedSubject);
 
                     if (signatureVerification.isSignatureValid()) {