ready to start debugging sn channels - towards a working version

Author: thsc42

app/libs/ASAPCertificate_0.1.0.jar

@@ -98,7 +98,7 @@ public BasicKeyStore getBasicKeyStore() {
     public ASAPPKI getAsapPKI() { return this.asapPKI; }
 
     public CharSequence getOwnerID() {
-        return this.ownerFactory.getOwner().getUUID();
+        return this.ownerFactory.getOwnerData().getUUID();
     }
 
     ////////////////////////////////////////////////////////////////////////////////////

app/src/main/java/net/sharksystem/asap/sharknet/android/SNChannelsComponent.java

@@ -14,7 +14,6 @@
 import net.sharksystem.asap.util.DateTimeHelper;
 import net.sharksystem.asap.android.Util;
 import net.sharksystem.crypto.SharkCryptoException;
-import net.sharksystem.sharknet.android.AndroidASAPKeyStorage;
 import net.sharksystem.sharknet.android.Owner;
 import net.sharksystem.sharknet.android.SharkNetApp;
 
@@ -83,7 +82,7 @@ public void onSaveClick(View view) throws SharkException {
         } else {
             Log.d(this.getLogStart(), "set new user name: " + userNameString);
             Owner identityStorage = null;
-            SharkNetApp.getSharkNetApp().getOwner().setDisplayName(userNameString);
+            SharkNetApp.getSharkNetApp().getOwnerData().setDisplayName(userNameString);
 
             // re-launch
             this.finish();

app/src/main/java/net/sharksystem/persons/android/OwnerActivity.java

@@ -32,7 +32,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // set user name in layout
         TextView tv = this.findViewById(R.id.ownerDisplayName);
-        tv.setText(SharkNetApp.getSharkNetApp().getOwner().getDisplayName());
+        tv.setText(SharkNetApp.getSharkNetApp().getOwnerData().getDisplayName());
 
         // set control number
         tv = this.findViewById(R.id.credentialsControlNumber);

app/src/main/java/net/sharksystem/persons/android/OwnerCredentialSendActivity.java

@@ -16,6 +16,6 @@ Context getContext() throws ASAPException {
     }
 
     Owner getOwnerStorage() {
-        return PersonsStorageAndroidComponent.getPersonsStorage().getOwner();
+        return PersonsStorageAndroidComponent.getPersonsStorage().getOwnerData();
     }
 }

app/src/main/java/net/sharksystem/persons/android/PersonAppActivity.java

@@ -19,6 +19,7 @@
 import net.sharksystem.crypto.ASAPKeyStorage;
 import net.sharksystem.persons.ASAPPKIImpl;
 import net.sharksystem.persons.CredentialMessage;
+import net.sharksystem.persons.FullAsapPKIStorage;
 import net.sharksystem.persons.TestHelperPersonStorage;
 import net.sharksystem.sharknet.android.AndroidASAPKeyStorage;
 import net.sharksystem.sharknet.android.Owner;
@@ -37,8 +38,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-public class PersonsStorageAndroidComponent extends ASAPPKIImpl
-        implements ASAPApplicationComponent, PersonsStorage /*InMemoPersonsStorageImpl*/ {
+public class PersonsStorageAndroidComponent extends FullAsapPKIStorage //ASAPPKIImpl
+        implements ASAPApplicationComponent, PersonsStorage, OwnerFactory /*InMemoPersonsStorageImpl*/ {
 
     public static final String SN_ANDROID_DEFAULT_SIGNING_ALGORITHM = "SHA256withRSA/PSS";
     private static final String PERSONS_STORAGE_FILE_NAME = "sn2_personsStorageFile";
@@ -85,11 +86,14 @@ private PersonsStorageAndroidComponent(ASAPApplication asapApplication,
 //            Log.d(this.getLogStart(), "there is no persons storage persistence file - ok. Start empty");
             Log.d(this.getLogStart(), "there is no persons storage persistence file - fill with EXAMPLE DATA");
             TestHelperPersonStorage.fillWithExampleData(this);
+            this.save();
         }
     }
 
-    public static void initialize(ASAPApplication asapApplication,
-                              OwnerFactory ownerFactory, AndroidASAPKeyStorage asapKeyStorage) {
+    public static PersonsStorageAndroidComponent initialize(
+            ASAPApplication asapApplication, OwnerFactory ownerFactory,
+            AndroidASAPKeyStorage asapKeyStorage) {
+
         try {
             /*
             File personsStorageFile =
@@ -110,11 +114,12 @@ public static void initialize(ASAPApplication asapApplication,
                     asapKeyStorage
             );
 
-            //instance.fillWithExampleData();
+            return PersonsStorageAndroidComponent.instance;
         } catch (Exception e) {
             Log.e(net.sharksystem.asap.util.Log.startLog(ASAPPKIImpl.class).toString(),
                     "problems when creating ASAP Storage:" + e.getLocalizedMessage());
         }
+        return null;
     }
 
     public static synchronized PersonsStorageAndroidComponent getPersonsStorage()
@@ -126,8 +131,8 @@ public static synchronized PersonsStorageAndroidComponent getPersonsStorage()
         return PersonsStorageAndroidComponent.instance;
     }
 
-    Owner getOwner() {
-        return this.ownerFactory.getOwner();
+    public Owner getOwnerData() {
+        return this.ownerFactory.getOwnerData();
     }
 
     /*

app/src/main/java/net/sharksystem/persons/android/PersonsStorageAndroidComponent.java

@@ -14,6 +14,7 @@
 import net.sharksystem.crypto.ASAPCertificateImpl;
 import net.sharksystem.crypto.ASAPKeyStorage;
 import net.sharksystem.crypto.BasicKeyStore;
+import net.sharksystem.crypto.InMemoASAPKeyStorage;
 import net.sharksystem.crypto.SharkCryptoException;
 import net.sharksystem.persons.ASAPKeyStoreWithWriteAccess;
 import net.sharksystem.persons.ASAPPKI;
@@ -37,8 +38,10 @@
 /**
  * Overwrites key creation and add kex persistence to the more general super class
  */
-public class AndroidASAPKeyStorage extends SampleFullAsapPKIStorage
-        implements ASAPKeyStoreWithWriteAccess, ASAPPKI, BasicKeyStore {
+public class AndroidASAPKeyStorage extends InMemoASAPKeyStorage
+//        SampleFullAsapPKIStorage
+//        implements ASAPKeyStoreWithWriteAccess, ASAPPKI, BasicKeyStore
+{
 
     private static final String KEYPAIR_CREATION_TIME = "ASAPCertificatesKeyPairCreationTime";
     public static final String KEYSTORE_NAME = "AndroidKeyStore";
@@ -58,7 +61,7 @@ public AndroidASAPKeyStorage(Context initialContext,
                                      CharSequence ownerID, CharSequence ownerName)
                 throws ASAPSecurityException {
 
-        super(ownerID, ownerName);
+        //super(ownerID, ownerName);
         this.initialContext = initialContext;
     }
 

app/src/main/java/net/sharksystem/sharknet/android/AndroidASAPKeyStorage.java

@@ -10,7 +10,6 @@
 
 import net.sharksystem.R;
 import net.sharksystem.asap.sharknet.android.SNChannelsListActivity;
-import net.sharksystem.makan.android.MakanListActivity;
 import net.sharksystem.persons.android.OwnerActivity;
 
 public class InitActivity extends AppCompatActivity {
@@ -22,7 +21,7 @@ protected void onCreate(Bundle savedInstanceState) {
         if(!SharkNetApp.isStarted()) {
             Log.d(this.getLogStart(), "Startup SharkNetApplication");
             SharkNetApp sharkNetApp = SharkNetApp.initializeSharkNetApp(this);
-            Owner owner = sharkNetApp.getOwner();
+            Owner owner = sharkNetApp.getOwnerData();
             if (!owner.isOwnerSet()) launchFirstActivity = false;
         }
 
@@ -45,7 +44,7 @@ public void onSaveClick(View view) {
             Toast.makeText(this, "you must define another name",
                     Toast.LENGTH_SHORT).show();
         } else {
-            SharkNetApp.getSharkNetApp().getOwner().setDisplayName(ownerName);
+            SharkNetApp.getSharkNetApp().getOwnerData().setDisplayName(ownerName);
             this.finish();
             Intent intent = new Intent(this, OwnerActivity.class);
             this.startActivity(intent);

app/src/main/java/net/sharksystem/sharknet/android/InitActivity.java

@@ -1,5 +1,5 @@
 package net.sharksystem.sharknet.android;
 
 public interface OwnerFactory {
-    Owner getOwner();
+    Owner getOwnerData();
 }

app/src/main/java/net/sharksystem/sharknet/android/OwnerFactory.java

@@ -64,36 +64,43 @@ static SharkNetApp initializeSharkNetApp(Activity initActivity) {
             appFormats.add(ASAPCertificateStorage.CERTIFICATE_APP_NAME);
 
             ///////////////// initialize application object  ///////////////////////////////////
+            Log.d(getLogStart(), "create SharkNetApp object");
             SharkNetApp.singleton = new SharkNetApp(appFormats, initActivity);
 
             // read owner information from preference or somewhere else
+            Log.d(getLogStart(), "get owner from shared preferences");
             Owner owner = SharkNetApp.singleton.getOwner(initActivity);
 
             ///////////////// initialize application components //////////////////////////////
             // key storage
+            Log.d(getLogStart(), "init AndroidASAPKeyStorage");
             AndroidASAPKeyStorage asapKeyStorage =
                     AndroidASAPKeyStorage.initializeASAPKeyStorage(
                             initActivity,
                             owner.getUUID(),
                             owner.getDisplayName());
 
             // persons / contacts
-            PersonsStorageAndroidComponent.initialize(
+            Log.d(getLogStart(), "init PersonsStorageAndroidComponent");
+
+            PersonsStorageAndroidComponent asapPKI = PersonsStorageAndroidComponent.initialize(
                     SharkNetApp.singleton, // ASAPApplication
                     SharkNetApp.singleton, // OwnerFactory
                     asapKeyStorage
             );
 
             // snChannels
+            Log.d(getLogStart(), "init SNChannelsComponent");
             SNChannelsComponent.initialize(
                     SharkNetApp.singleton, // ASAPApplication
-                    asapKeyStorage, // BasicKeyStore
-                    asapKeyStorage, // ASAPPKI
+                    asapPKI, // BasicKeyStore
+                    asapPKI, // ASAPPKI
                     SharkNetApp.singleton, // OwnerFactory
                     PersonsStorageAndroidComponent.getPersonsStorage() // PersonStorage
             );
 
             // all components put together - launch the system
+            Log.d(getLogStart(), "launch SN2 application");
             SharkNetApp.singleton.startASAPApplication();
         }
 
@@ -138,12 +145,12 @@ public Owner getOwner(Activity activity) {
     }
 
     @Override
-    public Owner getOwner() {
+    public Owner getOwnerData() {
         return this.getOwner(this.getActivity());
     }
 
-    public CharSequence getOwnerID() { return this.getOwner().getUUID(); }
+    public CharSequence getOwnerID() { return this.getOwnerData().getUUID(); }
     public CharSequence getOwnerName() {
-        return this.getOwner().getDisplayName();
+        return this.getOwnerData().getDisplayName();
     }
 }