added new screenshots, updated gitignore

.gitignore

@@ -1,63 +1,65 @@
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+# Built application files
+*.apk
+*.ap_
 
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
 
 # Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-
-# CMake
-cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
-# File-based project format
-*.iws
-
-# IntelliJ
+bin/
+gen/
 out/
 
-# mpeltonen/sbt-idea plugin
-.idea_modules/
+# Gradle files
+.gradle/
+build/
 
-# JIRA plugin
-atlassian-ide-plugin.xml
+# Local configuration file (sdk path, etc)
+local.properties
 
-# Cursive Clojure plugin
-.idea/replstate.xml
+# Proguard folder generated by Eclipse
+proguard/
 
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
+# Log Files
+*.log
 
-# Editor-based Rest Client
-.idea/httpRequests
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+.idea/caches
+
+# Keystore files
+# Uncomment the following line if you do not want to check your keystore files in.
+#*.jks
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md

app/src/main/java/de/overview/wg/its/mispbump/MainActivity.java

@@ -145,11 +145,15 @@ public class MainActivity extends AppCompatActivity {
 	private void refreshSyncedPartnerList() {
 //		syncedPartnerList = PreferenceManager.Instance(this).getSyncedPartnerList();
 
-		SyncedPartner sp = new SyncedPartner("Main Organisation A", "http://192.168.178.200");
+		SyncedPartner sp = new SyncedPartner("Example Organisation 1", "https://www.organisationa1.de");
         sp.generateTimeStamp();
         syncedPartnerList.add(sp);
 
-		if (syncedPartnerList == null) {
+        sp = new SyncedPartner("Example Organisation 2", "https://www.organisation2.de");
+        sp.generateTimeStamp();
+        syncedPartnerList.add(sp);
+
+		if (syncedPartnerList == null || syncedPartnerList.size() < 1) {
 			emptyPartnerListView.setVisibility(View.VISIBLE);
 			syncedPartnerRecyclerView.setVisibility(View.GONE);
 		} else {

app/src/main/java/de/overview/wg/its/mispbump/MyOrganisationActivity.java

@@ -240,11 +240,12 @@ public class MyOrganisationActivity extends AppCompatActivity implements View.On
 
         List<StringPair> orgInfoEntries = new ArrayList<>();
 
-        orgInfoEntries.add(new StringPair("UUID", org.getUuid()));
         orgInfoEntries.add(new StringPair("Description", org.getDescription()));
         orgInfoEntries.add(new StringPair("Nationality", org.getNationality()));
         orgInfoEntries.add(new StringPair("Sector", org.getSector()));
         orgInfoEntries.add(new StringPair("User Count", "" + org.getUserCount()));
+        orgInfoEntries.add(new StringPair("Email", user.getEmail()));
+        orgInfoEntries.add(new StringPair("UUID", org.getUuid()));
 
         adapter.setList(orgInfoEntries);
 

app/src/main/java/de/overview/wg/its/mispbump/QrSyncActivity.java

@@ -120,6 +120,11 @@ public class QrSyncActivity extends AppCompatActivity implements View.OnClickLis
 
     private void startPublicKeyExchange() {
 
+        cameraFragment.setReadQrEnabled(true);
+
+        TextView info = findViewById(R.id.qr_info);
+        info.setText("Public Key");
+
         currentScanState = ScanState.public_key;
 
         User myUser = preferenceManager.getMyUser();
@@ -129,8 +134,6 @@ public class QrSyncActivity extends AppCompatActivity implements View.OnClickLis
         PublicKeyQr publicKeyQr = new PublicKeyQr(myOrg.getName(), myUser.getEmail(), pubKey);
 
         showQr(publicKeyQr.toJSON().toString());
-
-        cameraFragment.setReadQrEnabled(true);
     }
 
     private void receivedPublicKey(PublicKeyQr publicKeyQr) {
@@ -146,6 +149,11 @@ public class QrSyncActivity extends AppCompatActivity implements View.OnClickLis
 
     private void startSyncInformationExchange() {
 
+        cameraFragment.setReadQrEnabled(true);
+
+        TextView info = findViewById(R.id.qr_info);
+        info.setText("Sync Information");
+
         currentScanState = ScanState.information;
 
         Organisation myOrg = preferenceManager.getMyOrganisation();
@@ -168,8 +176,6 @@ public class QrSyncActivity extends AppCompatActivity implements View.OnClickLis
 
         showQr(cryptography.encrypt(siqr.toJSON().toString()));
 
-        cameraFragment.setReadQrEnabled(true);
-
     }
 
     private void receivedSyncInformation(SyncInformationQr syncInformationQr) {

app/src/main/java/de/overview/wg/its/mispbump/cam/CameraFragment.java

@@ -74,7 +74,7 @@ public class CameraFragment extends Fragment implements ActivityCompat.OnRequest
     /**
      * Tag for the {@link Log}.
      */
-    private static final String TAG = "MISP_LOGGING";
+    private static final String TAG = "MISP_LOG";
 
     /**
      * Max preview width that is guaranteed by Camera2 API
@@ -385,7 +385,7 @@ public class CameraFragment extends Fragment implements ActivityCompat.OnRequest
                 // For still image captures, we use the largest available size.
                 Size largest = Collections.max(Arrays.asList(map.getOutputSizes(ImageFormat.YUV_420_888)), new CompareSizesByArea());
 
-                mImageReader = ImageReader.newInstance(largest.getWidth() / 16, largest.getHeight() / 16, ImageFormat.YUV_420_888, 2);
+                mImageReader = ImageReader.newInstance(largest.getWidth() / 8, largest.getHeight() / 8, ImageFormat.YUV_420_888, 2);
                 mImageReader.setOnImageAvailableListener(mOnImageAvailableListener, mBackgroundHandler);
 
                 // Find out if we need to swap dimension to get the preview size relative to sensor coordinate.
@@ -763,6 +763,9 @@ public class CameraFragment extends Fragment implements ActivityCompat.OnRequest
     }
 
     public void setReadQrEnabled(boolean enabled) {
+
+        Log.d(TAG, "setReadQrEnabled() called with: enabled = [" + enabled + "]");
+
         readQrEnabled = enabled;
     }
 

app/src/main/res/layout/activity_qr_sync.xml

@@ -25,7 +25,7 @@
 					android:background="@drawable/rounded_square">
 
 				<TextView
-						android:id="@+id/info"
+						android:id="@+id/qr_info"
 						android:paddingTop="10dp"
 						android:layout_marginBottom="-15dp"
 						android:textColor="#000"

app/src/main/res/layout/row_synced_organisation.xml

@@ -5,7 +5,7 @@
 		xmlns:android="http://schemas.android.com/apk/res/android"
 		xmlns:app="http://schemas.android.com/apk/res-auto"
 		android:layout_width="match_parent" android:layout_height="wrap_content"
-		android:layout_marginBottom="16dp"
+		android:layout_marginBottom="8dp"
 		app:cardBackgroundColor="@color/colorWhite"
 		app:cardElevation="2dp"
 		app:cardCornerRadius="0dp"

mispbump.iml

@@ -8,7 +8,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />