diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 63ef451..b754089 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,7 +19,7 @@ android:name="com.journeyapps.barcodescanner.CaptureActivity" android:screenOrientation="fullSensor" tools:replace="screenOrientation" /> - diff --git a/app/src/main/java/com/example/cosmosclient/views/GroupList.java b/app/src/main/java/com/example/cosmosclient/views/GroupList.java index 30f6f2a..f9067e5 100644 --- a/app/src/main/java/com/example/cosmosclient/views/GroupList.java +++ b/app/src/main/java/com/example/cosmosclient/views/GroupList.java @@ -90,8 +90,8 @@ if ( id == R.id.createNewGroupButton){ } else if (id == R.id.joinGroupButton){ - //Intent intent=new Intent(GroupList.this, com.example.cosmosclient.views.QRcodeReadingActivity.class); - //startActivity(intent); + Intent intent=new Intent(GroupList.this, com.example.cosmosclient.views.QRcodeReadingActivity.class); + startActivity(intent); } else if (id == R.id.signOutButton){ Intent intent=new Intent(GroupList.this, com.example.cosmosclient.views.SigninActivity.class); startActivity(intent);