Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 14:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Move keyagreement package into contact.add.nearby

Browse Source 
and fix some small warnings in the process
This commit is contained in:
Torsten Grote
2021-02-01 11:14:07 -03:00
parent ae923e5777
commit 94ec22bef8
18 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/AndroidManifest.xml
View File

@@ -342,7 +342,7 @@
</activity> </activity>
<activity <activity
android:name="org.briarproject.briar.android.keyagreement.ContactExchangeActivity" android:name="org.briarproject.briar.android.contact.add.nearby.ContactExchangeActivity"
android:label="@string/add_contact_title" android:label="@string/add_contact_title"
android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity" android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity"
android:theme="@style/BriarTheme.NoActionBar"> android:theme="@style/BriarTheme.NoActionBar">

2
briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
View File

@@ -31,9 +31,9 @@ import org.briarproject.briar.android.account.DozeHelperModule;
import org.briarproject.briar.android.account.LockManagerImpl; import org.briarproject.briar.android.account.LockManagerImpl;
import org.briarproject.briar.android.account.SetupModule; import org.briarproject.briar.android.account.SetupModule;
import org.briarproject.briar.android.contact.ContactListModule; import org.briarproject.briar.android.contact.ContactListModule;
import org.briarproject.briar.android.contact.add.nearby.ContactExchangeModule;
import org.briarproject.briar.android.forum.ForumModule; import org.briarproject.briar.android.forum.ForumModule;
import org.briarproject.briar.android.introduction.IntroductionModule; import org.briarproject.briar.android.introduction.IntroductionModule;
import org.briarproject.briar.android.keyagreement.ContactExchangeModule;
import org.briarproject.briar.android.logging.LoggingModule; import org.briarproject.briar.android.logging.LoggingModule;
import org.briarproject.briar.android.login.LoginModule; import org.briarproject.briar.android.login.LoginModule;
import org.briarproject.briar.android.navdrawer.NavDrawerModule; import org.briarproject.briar.android.navdrawer.NavDrawerModule;

8
briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
View File

@@ -36,10 +36,10 @@ import org.briarproject.briar.android.fragment.ScreenFilterDialogFragment;
import org.briarproject.briar.android.introduction.ContactChooserFragment; import org.briarproject.briar.android.introduction.ContactChooserFragment;
import org.briarproject.briar.android.introduction.IntroductionActivity; import org.briarproject.briar.android.introduction.IntroductionActivity;
import org.briarproject.briar.android.introduction.IntroductionMessageFragment; import org.briarproject.briar.android.introduction.IntroductionMessageFragment;
import org.briarproject.briar.android.keyagreement.ContactExchangeActivity; import org.briarproject.briar.android.contact.add.nearby.ContactExchangeActivity;
import org.briarproject.briar.android.keyagreement.ContactExchangeErrorFragment; import org.briarproject.briar.android.contact.add.nearby.ContactExchangeErrorFragment;
import org.briarproject.briar.android.keyagreement.KeyAgreementActivity; import org.briarproject.briar.android.contact.add.nearby.KeyAgreementActivity;
import org.briarproject.briar.android.keyagreement.KeyAgreementFragment; import org.briarproject.briar.android.contact.add.nearby.KeyAgreementFragment;
import org.briarproject.briar.android.login.ChangePasswordActivity; import org.briarproject.briar.android.login.ChangePasswordActivity;
import org.briarproject.briar.android.login.OpenDatabaseFragment; import org.briarproject.briar.android.login.OpenDatabaseFragment;
import org.briarproject.briar.android.login.PasswordFragment; import org.briarproject.briar.android.login.PasswordFragment;

2
briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
View File

@@ -19,7 +19,7 @@ import org.briarproject.briar.android.contact.add.remote.AddContactActivity;
import org.briarproject.briar.android.contact.add.remote.PendingContactListActivity; import org.briarproject.briar.android.contact.add.remote.PendingContactListActivity;
import org.briarproject.briar.android.conversation.ConversationActivity; import org.briarproject.briar.android.conversation.ConversationActivity;
import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.fragment.BaseFragment;
import org.briarproject.briar.android.keyagreement.ContactExchangeActivity; import org.briarproject.briar.android.contact.add.nearby.ContactExchangeActivity;
import org.briarproject.briar.android.util.BriarSnackbarBuilder; import org.briarproject.briar.android.util.BriarSnackbarBuilder;
import org.briarproject.briar.android.view.BriarRecyclerView; import org.briarproject.briar.android.view.BriarRecyclerView;

2
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraException.java → briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/CameraException.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.keyagreement; package org.briarproject.briar.android.contact.add.nearby;
import java.io.IOException; import java.io.IOException;

4
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java → briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/CameraView.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.keyagreement; package org.briarproject.briar.android.contact.add.nearby;
import android.content.Context; import android.content.Context;
import android.hardware.Camera; import android.hardware.Camera;
@@ -40,7 +40,6 @@ import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.logException;
@SuppressWarnings("deprecation")
@MethodsNotNullByDefault @MethodsNotNullByDefault
@ParametersNotNullByDefault @ParametersNotNullByDefault
public class CameraView extends SurfaceView implements SurfaceHolder.Callback, public class CameraView extends SurfaceView implements SurfaceHolder.Callback,
@@ -126,6 +125,7 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback,
throw new CameraException(e); throw new CameraException(e);
} }
setDisplayOrientation(getScreenRotationDegrees()); setDisplayOrientation(getScreenRotationDegrees());
if (camera == null) throw new CameraException("No camera found");
// Use barcode scene mode if it's available // Use barcode scene mode if it's available
Parameters params = camera.getParameters(); Parameters params = camera.getParameters();
params = setSceneMode(camera, params); params = setSceneMode(camera, params);

5
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeActivity.java → briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/ContactExchangeActivity.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.keyagreement; package org.briarproject.briar.android.contact.add.nearby;
import android.os.Bundle; import android.os.Bundle;
import android.widget.Toast; import android.widget.Toast;
@@ -15,7 +15,6 @@ import javax.inject.Inject;
import androidx.annotation.UiThread; import androidx.annotation.UiThread;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import androidx.lifecycle.ViewModelProviders;
import static android.widget.Toast.LENGTH_LONG; import static android.widget.Toast.LENGTH_LONG;
import static java.util.Objects.requireNonNull; import static java.util.Objects.requireNonNull;
@@ -39,7 +38,7 @@ public class ContactExchangeActivity extends KeyAgreementActivity {
super.onCreate(state); super.onCreate(state);
requireNonNull(getSupportActionBar()) requireNonNull(getSupportActionBar())
.setTitle(R.string.add_contact_title); .setTitle(R.string.add_contact_title);
viewModel = ViewModelProviders.of(this, viewModelFactory) viewModel = new ViewModelProvider(this, viewModelFactory)
.get(ContactExchangeViewModel.class); .get(ContactExchangeViewModel.class);
} }

2
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeErrorFragment.java → briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/ContactExchangeErrorFragment.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.keyagreement; package org.briarproject.briar.android.contact.add.nearby;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;

2
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeModule.java → briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/ContactExchangeModule.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.keyagreement; package org.briarproject.briar.android.contact.add.nearby;
import org.briarproject.briar.android.viewmodel.ViewModelKey; import org.briarproject.briar.android.viewmodel.ViewModelKey;

2
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeViewModel.java → briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/ContactExchangeViewModel.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.keyagreement; package org.briarproject.briar.android.contact.add.nearby;
import android.app.Application; import android.app.Application;

2
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/IntroFragment.java → briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/IntroFragment.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.keyagreement; package org.briarproject.briar.android.contact.add.nearby;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;

6
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java → briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/KeyAgreementActivity.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.keyagreement; package org.briarproject.briar.android.contact.add.nearby;
import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothAdapter;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
@@ -24,8 +24,8 @@ import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.android.activity.BriarActivity;
import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.fragment.BaseFragment;
import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener; import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener;
import org.briarproject.briar.android.keyagreement.IntroFragment.IntroScreenSeenListener; import org.briarproject.briar.android.contact.add.nearby.IntroFragment.IntroScreenSeenListener;
import org.briarproject.briar.android.keyagreement.KeyAgreementFragment.KeyAgreementEventListener; import org.briarproject.briar.android.contact.add.nearby.KeyAgreementFragment.KeyAgreementEventListener;
import java.util.logging.Logger; import java.util.logging.Logger;

4
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java → briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/KeyAgreementFragment.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.keyagreement; package org.briarproject.briar.android.contact.add.nearby;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
@@ -344,7 +344,7 @@ public class KeyAgreementFragment extends BaseEventFragment
@Override @Override
protected void finish() { protected void finish() {
getActivity().getSupportFragmentManager().popBackStack(); requireActivity().getSupportFragmentManager().popBackStack();
} }
@NotNullByDefault @NotNullByDefault

3
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/PreviewConsumer.java → briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/PreviewConsumer.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.keyagreement; package org.briarproject.briar.android.contact.add.nearby;
import android.hardware.Camera; import android.hardware.Camera;
@@ -6,7 +6,6 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import androidx.annotation.UiThread; import androidx.annotation.UiThread;
@SuppressWarnings("deprecation")
@NotNullByDefault @NotNullByDefault
interface PreviewConsumer { interface PreviewConsumer {

2
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeDecoder.java → briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/QrCodeDecoder.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.keyagreement; package org.briarproject.briar.android.contact.add.nearby;
import android.hardware.Camera; import android.hardware.Camera;
import android.hardware.Camera.CameraInfo; import android.hardware.Camera.CameraInfo;

6
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeUtils.java → briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/QrCodeUtils.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.keyagreement; package org.briarproject.briar.android.contact.add.nearby;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
@@ -18,13 +18,13 @@ import static android.graphics.Color.BLACK;
import static android.graphics.Color.WHITE; import static android.graphics.Color.WHITE;
import static com.google.zxing.BarcodeFormat.QR_CODE; import static com.google.zxing.BarcodeFormat.QR_CODE;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static java.util.logging.Logger.getLogger;
import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.logException;
@NotNullByDefault @NotNullByDefault
class QrCodeUtils { class QrCodeUtils {
private static final Logger LOG = private static final Logger LOG = getLogger(QrCodeUtils.class.getName());
Logger.getLogger(QrCodeUtils.class.getName());
@Nullable @Nullable
static Bitmap createQrCode(DisplayMetrics dm, String input) { static Bitmap createQrCode(DisplayMetrics dm, String input) {

4
briar-android/src/main/res/layout/activity_fragment_container_toolbar.xml
View File

@@ -4,11 +4,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
tools:context=".android.keyagreement.KeyAgreementActivity"> tools:context=".android.contact.add.nearby.KeyAgreementActivity">
<include layout="@layout/toolbar" /> <include layout="@layout/toolbar" />
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout
android:id="@+id/fragmentContainer" android:id="@+id/fragmentContainer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />

2
briar-android/src/main/res/layout/fragment_keyagreement_qr.xml
View File

@@ -5,7 +5,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:keepScreenOn="true"> android:keepScreenOn="true">
<org.briarproject.briar.android.keyagreement.CameraView <org.briarproject.briar.android.contact.add.nearby.CameraView
android:id="@+id/camera_view" android:id="@+id/camera_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />