commit 71d24e832bf2efc87db7291f70872409b9595891 Author: arrase arrase@gmail.com Date: Tue Nov 22 00:22:22 2016 +0100
bugfix --- app/src/main/AndroidManifest.xml | 6 +++++- .../java/org/torproject/android/ui/hs/HiddenServicesActivity.java | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 57dc32d..24d989a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -139,7 +139,11 @@ <activity android:name=".ui.hs.HiddenServicesActivity" android:label="@string/title_activity_hidden_services" - android:theme="@style/DefaultTheme" /> + android:theme="@style/DefaultTheme" > + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value="org.torproject.android.OrbotMainActivity" /> + </activity>
<provider android:name=".ui.hs.providers.HSContentProvider" diff --git a/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java b/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java index ae5e7fd..24bbd70 100644 --- a/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java +++ b/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java @@ -32,6 +32,8 @@ public class HiddenServicesActivity extends AppCompatActivity { HSContentProvider.HiddenService.CREATED_BY_USER };
+ private String mWhere = HSContentProvider.HiddenService.CREATED_BY_USER + "=1"; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -55,7 +57,7 @@ public class HiddenServicesActivity extends AppCompatActivity { mAdapter = new OnionListAdapter( this, mCR.query( - HSContentProvider.CONTENT_URI, mProjection, "created_by_user=1", null, null + HSContentProvider.CONTENT_URI, mProjection, mWhere, null, null ), 0 ); @@ -93,7 +95,7 @@ public class HiddenServicesActivity extends AppCompatActivity { @Override public void onChange(boolean selfChange) { mAdapter.changeCursor(mCR.query( - HSContentProvider.CONTENT_URI, mProjection, null, null, null + HSContentProvider.CONTENT_URI, mProjection, mWhere, null, null )); } }
tor-commits@lists.torproject.org