March 2017 - tor-commits - lists.torproject.org

[orbot/master] do not allow updates after creation via intent
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 9bb3e2a7b3c4c9d63abb397dcb07eff748e745de Author: arrase <arrase(a)gmail.com> Date: Thu Nov 17 22:55:18 2016 +0100 do not allow updates after creation via intent --- app/src/main/java/org/torproject/android/OrbotMainActivity.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 3a98022..d6012d5 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -620,7 +620,6 @@ public class OrbotMainActivity extends AppCompatActivity cr.insert(HSContentProvider.CONTENT_URI, fields); } else { onionHostname = row.getString(row.getColumnIndex(HSContentProvider.HiddenService.DOMAIN)); - cr.update(HSContentProvider.CONTENT_URI, fields, "port=" + mHsPort, null); row.close(); }

1 0

[orbot/master] revert
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit d1c117adb4f9bbb99e181934a990d0ca87ba5a59 Author: Juan Ezquerro LLanes <juan(a)paynopain.com> Date: Thu Nov 17 12:04:44 2016 +0100 revert --- proguard-project.txt | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/proguard-project.txt b/proguard-project.txt index f2fe155..e69de29 100644 --- a/proguard-project.txt +++ b/proguard-project.txt @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#}

1 0

[orbot/master] a better name for that
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 1af2fcb91f843b8859e819d7e0de9614267af9c5 Author: Juan Ezquerro LLanes <juan(a)paynopain.com> Date: Thu Nov 17 09:49:39 2016 +0100 a better name for that --- app/src/main/java/org/torproject/android/OrbotMainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 06c77cf..2949270 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -625,7 +625,7 @@ public class OrbotMainActivity extends AppCompatActivity final int hiddenServicePort = getIntent().getIntExtra("hs_port", -1); final int hiddenServiceRemotePort = getIntent().getIntExtra("hs_remote_port", -1); final String hiddenServiceName = getIntent().getStringExtra("hs_name"); - final boolean getHiddenServiceKey = getIntent().getBooleanExtra("hs_key",false); + final boolean getHiddenServiceKey = getIntent().getBooleanExtra("hs_get_key",false); DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {

1 0

[orbot/master] setup config file
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit ff47ccd340c6999c31549cee039ff8a1ceb03180 Author: Juan Ezquerro LLanes <juan(a)paynopain.com> Date: Thu Nov 17 13:42:50 2016 +0100 setup config file --- .../org/torproject/android/OrbotMainActivity.java | 4 +- .../org/torproject/android/service/TorService.java | 81 ++++++++++++---------- 2 files changed, 45 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 8541831..2e17f39 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -595,12 +595,12 @@ public class OrbotMainActivity extends AppCompatActivity if(row == null) { cr.insert(HSContentProvider.CONTENT_URI, fields); } else { - onionHostname = row.getString(row.getColumnIndex(HSContentProvider.HiddenService.NAME)); + onionHostname = row.getString(row.getColumnIndex(HSContentProvider.HiddenService.DOMAIN)); cr.update(HSContentProvider.CONTENT_URI, fields, "port=" + mHsPort, null); row.close(); } - if(onionHostname == null) { + if(onionHostname == null || onionHostname.length() < 1) { requestTorRereadConfig(); diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index d55e1cf..9942abb 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -16,6 +16,7 @@ import android.app.NotificationManager; import android.app.PendingIntent; import android.app.Service; import android.content.BroadcastReceiver; +import android.content.ContentResolver; import android.content.Context; import android.content.ContextWrapper; import android.content.Intent; @@ -23,12 +24,15 @@ import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.pm.PackageManager; +import android.database.Cursor; import android.net.ConnectivityManager; import android.net.NetworkInfo; +import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; +import android.provider.BaseColumns; import android.support.v4.app.NotificationCompat; import android.support.v4.content.LocalBroadcastManager; import android.text.TextUtils; @@ -128,6 +132,26 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private Shell mShell; private Shell mShellPolipo; + private static final Uri CONTENT_URI = Uri.parse("content://org.torproject.android.ui.hs.providers/hs"); + + public static final class HiddenService implements BaseColumns { + //Nombres de columnas + public static final String NAME = "name"; + public static final String PORT = "port"; + public static final String ONION_PORT = "onion_port"; + public static final String DOMAIN = "domain"; + + private HiddenService() { + } + } + + private String[] mProjection = new String[]{ + HiddenService._ID, + HiddenService.NAME, + HiddenService.DOMAIN, + HiddenService.PORT, + HiddenService.ONION_PORT}; + public void debug(String msg) { if (Prefs.useDebugLogging()) @@ -1778,49 +1802,30 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon return false; } - if (enableHiddenServices) - { - logNotice("hidden services are enabled"); - - //updateConfiguration("RendPostPeriod", "600 seconds", false); //possible feature to investigate - - String hsPorts = prefs.getString("pref_hs_ports",""); - - StringTokenizer st = new StringTokenizer (hsPorts,","); - String hsPortConfig = null; - int hsPort = -1; - - while (st.hasMoreTokens()) - { - try - { - hsPortConfig = st.nextToken().trim(); - - if (hsPortConfig.indexOf(":")==-1) //setup the port to localhost if not specifed - { - hsPortConfig = hsPortConfig + " 127.0.0.1:" + hsPortConfig; - } - - hsPort = Integer.parseInt(hsPortConfig.split(" ")[0]); + /* ---- Hidden Services ---- */ + ContentResolver mCR = getApplicationContext().getContentResolver(); + Cursor hidden_services = mCR.query(CONTENT_URI, mProjection, null, null, null); + if(hidden_services != null) { + try { + while (hidden_services.moveToNext()) { + Integer HSLocalPort = hidden_services.getInt(hidden_services.getColumnIndex(HiddenService.PORT)); + Integer HSOnionPort = hidden_services.getInt(hidden_services.getColumnIndex(HiddenService.ONION_PORT)); + String hsDirPath = new File(appCacheHome,"hs" + HSLocalPort).getCanonicalPath(); - String hsDirPath = new File(appCacheHome,"hs" + hsPort).getCanonicalPath(); - - debug("Adding hidden service on port: " + hsPortConfig); - - extraLines.append("HiddenServiceDir" + ' ' + hsDirPath).append('\n'); - extraLines.append("HiddenServicePort" + ' ' + hsPortConfig).append('\n'); - + debug("Adding hidden service on port: " + HSLocalPort); - } catch (NumberFormatException e) { + extraLines.append("HiddenServiceDir" + ' ' + hsDirPath).append('\n'); + extraLines.append("HiddenServicePort" + ' ' + HSOnionPort + " 127.0.0.1:" + HSLocalPort).append('\n'); + } + } catch (NumberFormatException e) { Log.e(OrbotConstants.TAG,"error parsing hsport",e); - } catch (Exception e) { + } catch (Exception e) { Log.e(OrbotConstants.TAG,"error starting share server",e); - } } - - - } - + + hidden_services.close(); + } + return true; }

1 0

[orbot/master] @NonNull
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit c6054bb25677d347730be20c9ba343b0e102da8a Author: arrase <arrase(a)gmail.com> Date: Thu Nov 17 20:48:20 2016 +0100 @NonNull --- .../torproject/android/ui/hs/providers/HSContentProvider.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/hs/providers/HSContentProvider.java b/app/src/main/java/org/torproject/android/ui/hs/providers/HSContentProvider.java index d340499..efde07f 100644 --- a/app/src/main/java/org/torproject/android/ui/hs/providers/HSContentProvider.java +++ b/app/src/main/java/org/torproject/android/ui/hs/providers/HSContentProvider.java @@ -9,6 +9,7 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.net.Uri; import android.provider.BaseColumns; +import android.support.annotation.NonNull; import android.support.annotation.Nullable; import org.torproject.android.ui.hs.database.HSDatabase; @@ -43,7 +44,7 @@ public class HSContentProvider extends ContentProvider { @Nullable @Override - public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { + public Cursor query(@NonNull Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { //Si es una consulta a un ID concreto construimos el WHERE String where = selection; if (uriMatcher.match(uri) == ONION_ID) { @@ -58,7 +59,7 @@ public class HSContentProvider extends ContentProvider { @Nullable @Override - public String getType(Uri uri) { + public String getType(@NonNull Uri uri) { int match = uriMatcher.match(uri); switch (match) { @@ -73,7 +74,7 @@ public class HSContentProvider extends ContentProvider { @Nullable @Override - public Uri insert(Uri uri, ContentValues values) { + public Uri insert(@NonNull Uri uri, ContentValues values) { long regId; SQLiteDatabase db = mServerDB.getWritableDatabase(); @@ -86,7 +87,7 @@ public class HSContentProvider extends ContentProvider { } @Override - public int delete(Uri uri, String selection, String[] selectionArgs) { + public int delete(@NonNull Uri uri, String selection, String[] selectionArgs) { //Si es una consulta a un ID concreto construimos el WHERE String where = selection; @@ -105,7 +106,7 @@ public class HSContentProvider extends ContentProvider { } @Override - public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { + public int update(@NonNull Uri uri, ContentValues values, String selection, String[] selectionArgs) { SQLiteDatabase db = mServerDB.getWritableDatabase(); String where = selection;

1 0

[orbot/master] save checkbox value
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit c3d7743fdac6fd69c02c111a14103f514b3c3fa5 Author: Juan Ezquerro LLanes <juan(a)paynopain.com> Date: Thu Nov 17 16:33:07 2016 +0100 save checkbox value --- .../org/torproject/android/ui/hs/dialogs/HSDataDialog.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSDataDialog.java b/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSDataDialog.java index 0dc0a30..f5237e3 100644 --- a/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSDataDialog.java +++ b/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSDataDialog.java @@ -5,12 +5,14 @@ import android.app.Dialog; import android.content.ContentResolver; import android.content.ContentValues; import android.os.Bundle; +import android.support.annotation.BoolRes; import android.support.annotation.NonNull; import android.support.v4.app.DialogFragment; import android.support.v4.app.ShareCompat; import android.support.v7.app.AlertDialog; import android.view.View; import android.widget.Button; +import android.widget.CheckBox; import android.widget.EditText; import android.widget.Toast; @@ -43,8 +45,10 @@ public class HSDataDialog extends DialogFragment { ((EditText) dialog_view.findViewById(R.id.hsOnionPort)).getText().toString() ); + Boolean allowBackups = ((CheckBox) dialog_view.findViewById(R.id.allow_managed_backup)).isEnabled(); + if (checkInput(localPort,onionPort)) { - saveData(serverName, localPort,onionPort); + saveData(serverName, localPort,onionPort,allowBackups); serverDataDialog.dismiss(); } } @@ -64,7 +68,7 @@ public class HSDataDialog extends DialogFragment { boolean is_ok = true; Integer error_msg = 0; - if ((local <= 1 || local > 65535) || (remote <= 1 || remote > 65535)) { + if ((local < 1 || local > 65535) || (remote < 1 || remote > 65535)) { error_msg = R.string.invalid_port; is_ok = false; } @@ -76,11 +80,12 @@ public class HSDataDialog extends DialogFragment { return is_ok; } - private void saveData(String name, Integer local, Integer remote) { + private void saveData(String name, Integer local, Integer remote, Boolean allowBackups) { ContentValues fields = new ContentValues(); fields.put("name", name); fields.put("port", local); fields.put("onion_port", remote); + fields.put("allow_managed_backups", allowBackups); ContentResolver cr = getContext().getContentResolver();

1 0

[orbot/master] no longer needed
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 8b3a26f297f49edd2aac93bba4e621d0456a3635 Author: Juan Ezquerro LLanes <juan(a)paynopain.com> Date: Thu Nov 17 13:45:31 2016 +0100 no longer needed --- .../org/torproject/android/service/TorService.java | 71 ---------------------- 1 file changed, 71 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 9942abb..e1971c8 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -465,75 +465,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon sendCallbackStatus(STATUS_OFF); } - - private String getHiddenServiceHostname () - { - - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - - boolean enableHiddenServices = prefs.getBoolean("pref_hs_enable", false); - - StringBuffer result = new StringBuffer(); - - if (enableHiddenServices) - { - String hsPorts = prefs.getString("pref_hs_ports",""); - - StringTokenizer st = new StringTokenizer (hsPorts,","); - String hsPortConfig = null; - - while (st.hasMoreTokens()) - { - - int hsPort = Integer.parseInt(st.nextToken().split(" ")[0]);; - - File fileDir = new File(appCacheHome, "hs" + hsPort); - File file = new File(fileDir, "hostname"); - - - if (file.exists()) - { - try { - String onionHostname = Utils.readString(new FileInputStream(file)).trim(); - - if (result.length() > 0) - result.append(","); - - result.append(onionHostname); - - - } catch (FileNotFoundException e) { - logException("unable to read onion hostname file",e); - showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr); - return null; - } - } - else - { - showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr); - return null; - - } - } - - if (result.length() > 0) - { - String onionHostname = result.toString(); - - showToolbarNotification(getString(R.string.hidden_service_on) + ' ' + onionHostname, HS_NOTIFY_ID, R.drawable.ic_stat_tor); - Editor pEdit = prefs.edit(); - pEdit.putString("pref_hs_hostname",onionHostname); - pEdit.commit(); - - return onionHostname; - } - - } - - return null; - } - - private void killAllDaemons() throws Exception { if (conn != null) { logNotice("Using control port to shutdown Tor"); @@ -831,8 +762,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon enableTransparentProxy(); } - getHiddenServiceHostname (); - } catch (Exception e) { logException("Unable to start Tor: " + e.toString(), e); showToolbarNotification(

1 0

[orbot/master] update new onions
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit e152dd381014a1f77681d446b5d4ff07c443ee94 Author: Juan Ezquerro LLanes <juan(a)paynopain.com> Date: Thu Nov 17 15:43:50 2016 +0100 update new onions --- .../org/torproject/android/service/TorService.java | 46 +++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index cd2285b..915aad7 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -17,6 +17,7 @@ import android.app.PendingIntent; import android.app.Service; import android.content.BroadcastReceiver; import android.content.ContentResolver; +import android.content.ContentValues; import android.content.Context; import android.content.ContextWrapper; import android.content.Intent; @@ -762,7 +763,50 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon enableTransparentProxy(); } - // TODO: Tor is running, update new .onion names at db + // Tor is running, update new .onion names at db + ContentResolver mCR = getApplicationContext().getContentResolver(); + Cursor hidden_services = mCR.query(CONTENT_URI, mProjection, null, null, null); + if(hidden_services != null) { + try { + while (hidden_services.moveToNext()) { + String HSDomain = hidden_services.getString(hidden_services.getColumnIndex(HiddenService.DOMAIN)); + Integer HSLocalPort = hidden_services.getInt(hidden_services.getColumnIndex(HiddenService.PORT)); + + // Update only new domains + if(!"".equals(HSDomain)) + continue; + + String hsDirPath = new File(appCacheHome,"hs" + HSLocalPort).getCanonicalPath(); + File file = new File(hsDirPath, "hostname"); + + if (file.exists()) + { + ContentValues fields = new ContentValues(); + + try { + String onionHostname = Utils.readString(new FileInputStream(file)).trim(); + fields.put("domain", onionHostname); + mCR.update(CONTENT_URI, fields, "port=" + HSLocalPort , null); + } catch (FileNotFoundException e) { + logException("unable to read onion hostname file",e); + showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr); + } + } + else + { + showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr); + + } + } + + } catch (NumberFormatException e) { + Log.e(OrbotConstants.TAG,"error parsing hsport",e); + } catch (Exception e) { + Log.e(OrbotConstants.TAG,"error starting share server",e); + } + + hidden_services.close(); + } } catch (Exception e) { logException("Unable to start Tor: " + e.toString(), e);

1 0

[orbot/master] bug fix
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 67d999b8317282ca375f85344e81ebee7f063750 Author: arrase <arrase(a)gmail.com> Date: Thu Nov 17 20:45:40 2016 +0100 bug fix --- .../android/ui/hs/providers/HSContentProvider.java | 12 ++++++- .../org/torproject/android/service/TorService.java | 39 +++++++++++----------- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/hs/providers/HSContentProvider.java b/app/src/main/java/org/torproject/android/ui/hs/providers/HSContentProvider.java index 9b52a37..d340499 100644 --- a/app/src/main/java/org/torproject/android/ui/hs/providers/HSContentProvider.java +++ b/app/src/main/java/org/torproject/android/ui/hs/providers/HSContentProvider.java @@ -106,7 +106,17 @@ public class HSContentProvider extends ContentProvider { @Override public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { - return 0; + SQLiteDatabase db = mServerDB.getWritableDatabase(); + + String where = selection; + if (uriMatcher.match(uri) == ONION_ID) { + where = "_id=" + uri.getLastPathSegment(); + } + + Integer rows = db.update(HSDatabase.HS_DATA_TABLE_NAME, values, where, null); + mContext.getContentResolver().notifyChange(CONTENT_URI, null); + + return rows; } public static final class HiddenService implements BaseColumns { diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 915aad7..09a75ca 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -773,29 +773,28 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon Integer HSLocalPort = hidden_services.getInt(hidden_services.getColumnIndex(HiddenService.PORT)); // Update only new domains - if(!"".equals(HSDomain)) - continue; + if(HSDomain == null || HSDomain.length() < 1) { + String hsDirPath = new File(appCacheHome,"hs" + HSLocalPort).getCanonicalPath(); + File file = new File(hsDirPath, "hostname"); - String hsDirPath = new File(appCacheHome,"hs" + HSLocalPort).getCanonicalPath(); - File file = new File(hsDirPath, "hostname"); - - if (file.exists()) - { - ContentValues fields = new ContentValues(); - - try { - String onionHostname = Utils.readString(new FileInputStream(file)).trim(); - fields.put("domain", onionHostname); - mCR.update(CONTENT_URI, fields, "port=" + HSLocalPort , null); - } catch (FileNotFoundException e) { - logException("unable to read onion hostname file",e); - showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr); + if (file.exists()) + { + ContentValues fields = new ContentValues(); + + try { + String onionHostname = Utils.readString(new FileInputStream(file)).trim(); + fields.put("domain", onionHostname); + mCR.update(CONTENT_URI, fields, "port=" + HSLocalPort , null); + } catch (FileNotFoundException e) { + logException("unable to read onion hostname file",e); + showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr); + } } - } - else - { - showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr); + else + { + showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr); + } } }

1 0

[orbot/master] preference migration
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 356d7235b45cf8128378c8bc8414fb87394490be Author: arrase <arrase(a)gmail.com> Date: Thu Nov 17 22:10:46 2016 +0100 preference migration --- .../org/torproject/android/OrbotMainActivity.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index f887291..3a98022 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -152,6 +152,28 @@ public class OrbotMainActivity extends AppCompatActivity return super.onCreateView(parent, name, context, attrs); return null; } + + private void migratePreferences(){ + String hsPortString = mPrefs.getString("pref_hs_ports", ""); + if(hsPortString.length() > 0) + { + StringTokenizer st = new StringTokenizer (hsPortString,","); + ContentResolver cr = getContentResolver(); + while (st.hasMoreTokens()) + { + int hsPort = Integer.parseInt(st.nextToken().split(" ")[0]); + ContentValues fields = new ContentValues(); + fields.put("name", hsPort); + fields.put("port", hsPort); + fields.put("onion_port", hsPort); + cr.insert(HSContentProvider.CONTENT_URI, fields); + } + + Editor pEdit = mPrefs.edit(); + pEdit.remove("pref_hs_ports"); + pEdit.commit(); + } + } /** Called when the activity is first created. */ public void onCreate(Bundle savedInstanceState) { @@ -159,6 +181,8 @@ public class OrbotMainActivity extends AppCompatActivity mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + migratePreferences(); // Migrate old preferences + /* Create the widgets before registering for broadcasts to guarantee * that the widgets exist when the status updates try to update them */ doLayout();

1 0