Quellcode durchsuchen

util: Extract non-Android utility interfaces

As part of a refactoring that will likely introduce more custom
collection classes, move the non-Android-specific parts outside the
com.wireguard.android package.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
master
Samuel Holland vor 6 Jahren
Ursprung
Commit
4acee49d4b
10 geänderte Dateien mit 17 neuen und 9 gelöschten Zeilen
  1. +1
    -1
      app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java
  2. +1
    -1
      app/src/main/java/com/wireguard/android/databinding/ObservableKeyedListAdapter.java
  3. +1
    -1
      app/src/main/java/com/wireguard/android/model/Tunnel.java
  4. +2
    -0
      app/src/main/java/com/wireguard/android/util/ObservableKeyedArrayList.java
  5. +3
    -0
      app/src/main/java/com/wireguard/android/util/ObservableKeyedList.java
  6. +3
    -0
      app/src/main/java/com/wireguard/android/util/ObservableSortedKeyedArrayList.java
  7. +3
    -0
      app/src/main/java/com/wireguard/android/util/ObservableSortedKeyedList.java
  8. +1
    -2
      app/src/main/java/com/wireguard/util/Keyed.java
  9. +1
    -2
      app/src/main/java/com/wireguard/util/KeyedList.java
  10. +1
    -2
      app/src/main/java/com/wireguard/util/SortedKeyedList.java

+ 1
- 1
app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java Datei anzeigen

@@ -15,7 +15,7 @@ import android.widget.ListView;
import android.widget.TextView;

import com.wireguard.android.R;
import com.wireguard.android.util.Keyed;
import com.wireguard.util.Keyed;
import com.wireguard.android.util.ObservableKeyedList;
import com.wireguard.android.widget.ToggleSwitch;
import com.wireguard.android.widget.ToggleSwitch.OnBeforeCheckedChangeListener;


+ 1
- 1
app/src/main/java/com/wireguard/android/databinding/ObservableKeyedListAdapter.java Datei anzeigen

@@ -16,7 +16,7 @@ import android.view.ViewGroup;
import android.widget.BaseAdapter;

import com.wireguard.android.BR;
import com.wireguard.android.util.Keyed;
import com.wireguard.util.Keyed;
import com.wireguard.android.util.ObservableKeyedList;

import java.lang.ref.WeakReference;


+ 1
- 1
app/src/main/java/com/wireguard/android/model/Tunnel.java Datei anzeigen

@@ -13,7 +13,7 @@ import android.support.annotation.Nullable;

import com.wireguard.android.BR;
import com.wireguard.android.util.ExceptionLoggers;
import com.wireguard.android.util.Keyed;
import com.wireguard.util.Keyed;
import com.wireguard.config.Config;

import java.util.regex.Pattern;


+ 2
- 0
app/src/main/java/com/wireguard/android/util/ObservableKeyedArrayList.java Datei anzeigen

@@ -9,6 +9,8 @@ package com.wireguard.android.util;
import android.databinding.ObservableArrayList;
import android.support.annotation.NonNull;

import com.wireguard.util.Keyed;

import java.util.Collection;
import java.util.ListIterator;
import java.util.Objects;


+ 3
- 0
app/src/main/java/com/wireguard/android/util/ObservableKeyedList.java Datei anzeigen

@@ -8,6 +8,9 @@ package com.wireguard.android.util;

import android.databinding.ObservableList;

import com.wireguard.util.Keyed;
import com.wireguard.util.KeyedList;

/**
* A list that is both keyed and observable.
*/


+ 3
- 0
app/src/main/java/com/wireguard/android/util/ObservableSortedKeyedArrayList.java Datei anzeigen

@@ -8,6 +8,9 @@ package com.wireguard.android.util;

import android.support.annotation.NonNull;

import com.wireguard.util.Keyed;
import com.wireguard.util.SortedKeyedList;

import java.util.AbstractList;
import java.util.Collection;
import java.util.Collections;


+ 3
- 0
app/src/main/java/com/wireguard/android/util/ObservableSortedKeyedList.java Datei anzeigen

@@ -6,6 +6,9 @@

package com.wireguard.android.util;

import com.wireguard.util.Keyed;
import com.wireguard.util.SortedKeyedList;

/**
* A list that is both sorted/keyed and observable.
*/


app/src/main/java/com/wireguard/android/util/Keyed.java → app/src/main/java/com/wireguard/util/Keyed.java Datei anzeigen

@@ -1,10 +1,9 @@
/*
* Copyright © 2018 Samuel Holland <samuel@sholland.org>
* Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* SPDX-License-Identifier: GPL-2.0-or-later
*/

package com.wireguard.android.util;
package com.wireguard.util;

/**
* Interface for objects that have a identifying key of the given type.

app/src/main/java/com/wireguard/android/util/KeyedList.java → app/src/main/java/com/wireguard/util/KeyedList.java Datei anzeigen

@@ -1,10 +1,9 @@
/*
* Copyright © 2018 Samuel Holland <samuel@sholland.org>
* Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* SPDX-License-Identifier: GPL-2.0-or-later
*/

package com.wireguard.android.util;
package com.wireguard.util;

import java.util.Collection;
import java.util.List;

app/src/main/java/com/wireguard/android/util/SortedKeyedList.java → app/src/main/java/com/wireguard/util/SortedKeyedList.java Datei anzeigen

@@ -1,10 +1,9 @@
/*
* Copyright © 2018 Samuel Holland <samuel@sholland.org>
* Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* SPDX-License-Identifier: GPL-2.0-or-later
*/

package com.wireguard.android.util;
package com.wireguard.util;

import java.util.Collection;
import java.util.Comparator;

Laden…
Abbrechen
Speichern