Skip to content

Commit 1a4c912

Browse files
ホワイトリスト画面が開かない件の修正
## 更新内容 * ホワイトリスト追加画面が開かない件の修正。 * AndroidX対応漏れ対応。
1 parent 2badfc8 commit 1a4c912

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

dConnectManager/dConnectManager/dconnect-manager-app/src/main/java/org/deviceconnect/android/manager/setting/WhitelistActivity.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
*/
77
package org.deviceconnect.android.manager.setting;
88

9-
import android.app.Fragment;
10-
import android.app.FragmentManager;
11-
import android.app.FragmentTransaction;
9+
1210
import android.os.Bundle;
1311
import androidx.appcompat.app.AppCompatActivity;
12+
import androidx.fragment.app.Fragment;
13+
import androidx.fragment.app.FragmentManager;
14+
import androidx.fragment.app.FragmentTransaction;
1415

1516
import org.deviceconnect.android.manager.R;
1617

@@ -29,7 +30,7 @@ protected void onCreate(final Bundle savedInstanceState) {
2930

3031
if (savedInstanceState == null) {
3132
Fragment f = new WhitelistFragment();
32-
FragmentManager fm = getFragmentManager();
33+
FragmentManager fm = getSupportFragmentManager();
3334
FragmentTransaction t = fm.beginTransaction();
3435
t.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
3536
t.add(android.R.id.content, f, "continar");

dConnectManager/dConnectManager/dconnect-manager-app/src/main/java/org/deviceconnect/android/manager/setting/WhitelistFragment.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
package org.deviceconnect.android.manager.setting;
88

99
import android.app.Activity;
10-
import android.app.AlertDialog;
11-
import android.app.Fragment;
1210
import android.content.ContentResolver;
1311
import android.content.Context;
1412
import android.content.DialogInterface;
@@ -26,9 +24,7 @@
2624
import android.view.Menu;
2725
import android.view.MenuInflater;
2826
import android.view.MenuItem;
29-
import android.view.MenuItem.OnMenuItemClickListener;
3027
import android.view.View;
31-
import android.view.View.OnClickListener;
3228
import android.view.ViewGroup;
3329
import android.widget.ArrayAdapter;
3430
import android.widget.Button;
@@ -38,6 +34,9 @@
3834
import android.widget.TextView;
3935
import android.widget.Toast;
4036

37+
import androidx.appcompat.app.AlertDialog;
38+
import androidx.fragment.app.Fragment;
39+
4140
import org.deviceconnect.android.manager.BuildConfig;
4241
import org.deviceconnect.android.manager.R;
4342
import org.deviceconnect.android.manager.core.policy.Origin;
@@ -367,7 +366,7 @@ private void openAddDialog() {
367366
showPopup(e.getMessage());
368367
}
369368
};
370-
builder.create().show();
369+
builders.create().show();
371370
break;
372371
default:
373372
// nothing to do

dConnectManager/dConnectManager/dconnect-manager-app/src/things/res/xml/settings_dconnect_security.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
android:key="@string/key_settings_dconn_whitelist"
5050
android:title="@string/activity_settings_manage_whitelist">
5151
<intent android:targetPackage="org.deviceconnect.android.manager"
52-
android:targetClass="org.deviceconnect.android.manager.policy.WhitelistActivity" />
52+
android:targetClass="org.deviceconnect.android.manager.setting.WhitelistActivity" />
5353
</PreferenceScreen>
5454
<PreferenceScreen
5555
android:key="@string/key_settings_dconn_websocket"

0 commit comments

Comments
 (0)